commit 6b06472a560cebdfa87928c48e8a00e4fe0e7443
author Jingning Han <jingning@google.com> Mon May 01 09:48:18 2017 -0700
committer Jingning Han <jingning@google.com> Mon May 01 17:45:21 2017 +0000
tree c01dc561cef59975c83610b6891d68d333dcebde
parent 865a6f2764021b8f9ac02bd8ea5ca45f645bb7d6

Fix enc/dec mismatch when sub8x8_comp_ref is forced off

BUG=aomedia:480

Change-Id: Ica26275274614d283db0cefcffac1f86993c4d6b

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index e60c64f..855d298 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1206,13 +1206,11 @@
 static REFERENCE_MODE read_block_reference_mode(AV1_COMMON *cm,
                                                 const MACROBLOCKD *xd,
                                                 aom_reader *r) {
+#if !SUB8X8_COMP_REF
+  if (xd->mi[0]->mbmi.sb_type < BLOCK_8X8) return SINGLE_REFERENCE;
+#endif
   if (cm->reference_mode == REFERENCE_MODE_SELECT) {
     const int ctx = av1_get_reference_mode_context(cm, xd);
-
-#if !SUB8X8_COMP_REF
-    if (xd->mi[0]->mbmi.sb_type < BLOCK_8X8) return SINGLE_REFERENCE;
-#endif
-
     const REFERENCE_MODE mode =
         (REFERENCE_MODE)aom_read(r, cm->fc->comp_inter_prob[ctx], ACCT_STR);
     FRAME_COUNTS *counts = xd->counts;