commit daa8d7e606b24b8233f39bb74d190ab1091a931f
author Debargha Mukherjee <debargha@google.com> Sat Apr 07 13:07:29 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Mon Apr 09 17:35:19 2018 +0000
tree 3e5b53c8b298c3f647c08fc8d2e12e3c264eb335
parent 9a08adcb268cc822128d582cac815f1cce397f91

Fix encoder for the case enable_order_hint is 0

Fixes an encoder side mismatch issue triggered when
enable_order_hint is set as 0.

Change-Id: Ib6da71b6838107ba12d64dfdc2dfe052062d88bd

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9e721a9..f0e12f1 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2711,6 +2711,7 @@
 
   if (seq_params->enable_order_hint)
     aom_wb_write_literal(wb, seq_params->order_hint_bits_minus1, 3);
+
   aom_wb_write_bit(wb, seq_params->enable_superres);
   aom_wb_write_bit(wb, seq_params->enable_cdef);
   aom_wb_write_bit(wb, seq_params->enable_restoration);
@@ -2905,8 +2906,9 @@
 
   cm->frame_refs_short_signaling = 0;
 
-  aom_wb_write_literal(wb, cm->frame_offset,
-                       cm->seq_params.order_hint_bits_minus1 + 1);
+  if (cm->seq_params.enable_order_hint)
+    aom_wb_write_literal(wb, cm->frame_offset,
+                         cm->seq_params.order_hint_bits_minus1 + 1);
 
   if (!cm->error_resilient_mode && !frame_is_intra_only(cm)) {
     aom_wb_write_literal(wb, cm->primary_ref_frame, PRIMARY_REF_BITS);
@@ -3042,6 +3044,8 @@
       aom_wb_write_bit(wb, cm->switchable_motion_mode);
       if (frame_might_allow_ref_frame_mvs(cm)) {
         aom_wb_write_bit(wb, cm->allow_ref_frame_mvs);
+      } else {
+        assert(cm->allow_ref_frame_mvs == 0);
       }
     }
   }