commit dfcbfbd436ad66d5102508a50563e7331d72c60e
author Hui Su <huisu@google.com> Mon Nov 13 12:05:30 2017 -0800
committer Hui Su <huisu@google.com> Tue Nov 14 18:11:25 2017 +0000
tree 540e205d7039cb4e4cf78943571e7844cf38f0cc
parent 1c2dfae3c3921a840e0321462bb13186e32cd211

intrabc: use its own mv cost table

To faciliate using intrabc on interframes.

Change-Id: Ibfe376190adf24d15198c5fb548e1050e191a3d6

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 4954c8f..b86c8d8 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8873,11 +8873,12 @@
     x->skip = 0;
     av1_build_inter_predictors_sb(cm, xd, mi_row, mi_col, NULL, bsize);
 
-    assert(x->mvcost == x->mv_cost_stack[0]);
+    int *dvcost[2] = { (int *)&cpi->dv_cost[0][MV_MAX],
+                       (int *)&cpi->dv_cost[1][MV_MAX] };
     // TODO(aconverse@google.com): The full motion field defining discount
     // in MV_COST_WEIGHT is too large. Explore other values.
-    int rate_mv = av1_mv_bit_cost(&dv, &dv_ref.as_mv, x->nmvjointcost,
-                                  x->mvcost, MV_COST_WEIGHT_SUB);
+    int rate_mv = av1_mv_bit_cost(&dv, &dv_ref.as_mv, cpi->dv_joint_cost,
+                                  dvcost, MV_COST_WEIGHT_SUB);
     const int rate_mode = x->intrabc_cost[1];
     RD_STATS rd_stats, rd_stats_uv;
     av1_subtract_plane(x, bsize, 0);