commit 4306b6e5995d99a655dd5a585003e8448456215d
author Yaowu Xu <yaowu@google.com> Tue Sep 27 12:55:32 2016 -0700
committer Jingning Han <jingning@google.com> Thu Sep 29 12:41:55 2016 -0700
tree 57fe33fdfe41767539d4d93e7570a3dc9f8f5282
parent dc035da9b920fa6c0dc0393a0814aed4b3164827

more ref_mv changes from aom/master

Change-Id: I9152f898dfacdf3877ed719f193bb1e0dbee0a1a

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 0c80174..4d157ff 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -335,10 +335,13 @@
 }
 
 #if CONFIG_REF_MV
-void av1_set_mvcost(MACROBLOCK *x, MV_REFERENCE_FRAME ref_frame) {
+void av1_set_mvcost(MACROBLOCK *x, MV_REFERENCE_FRAME ref_frame, int ref,
+                    int ref_mv_idx) {
   MB_MODE_INFO_EXT *mbmi_ext = x->mbmi_ext;
-  int nmv_ctx = av1_nmv_ctx(mbmi_ext->ref_mv_count[ref_frame],
-                            mbmi_ext->ref_mv_stack[ref_frame]);
+  int8_t rf_type = av1_ref_frame_type(x->e_mbd.mi[0]->mbmi.ref_frame);
+  int nmv_ctx = av1_nmv_ctx(mbmi_ext->ref_mv_count[rf_type],
+                            mbmi_ext->ref_mv_stack[rf_type], ref, ref_mv_idx);
+  (void)ref_frame;
   x->mvcost = x->mv_cost_stack[nmv_ctx];
   x->nmvjointcost = x->nmv_vec_cost[nmv_ctx];
   x->mvsadcost = x->mvcost;