commit 7f1dfa007156f6f536a2c1f7dd084ab93c2df670
author Debargha Mukherjee <debargha@google.com> Wed Mar 14 22:25:43 2018 -0700
committer Zoe Liu <zoeliu@google.com> Fri Mar 16 11:15:26 2018 +0000
tree 770196a583c6c74aea901c367e59f8a51e3eb5e6
parent 1f5c3fc7c84b373628d5d5cf27ab61560267f0d0

[NORMATIVE] Renable frame refs signaling for ER.

Now that OrderHints are explicitly signaled, there is
no need to disable short refs signaling.

Change-Id: Id9547d0eaf29b2d8c742b108011357dbd07d7204

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index bb316f2..bfc6734 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3178,12 +3178,10 @@
       }
 
 #if CONFIG_FRAME_REFS_SIGNALING
-      // TODO(zoeliu@google.com): To complete the encoder-side implementation
-      // for the scenario cm->frame_refs_short_signaling == 1.
       assert(cm->frame_refs_short_signaling == 0);
       // NOTE: Error resilient mode turns off frame_refs_short_signaling
       //       automatically.
-      if (!cm->error_resilient_mode && cm->seq_params.enable_order_hint)
+      if (cm->seq_params.enable_order_hint)
         aom_wb_write_bit(wb, cm->frame_refs_short_signaling);
       else
         assert(cm->frame_refs_short_signaling == 0);