commit d4a67a8f7eb01ad0f3e77f14b2384ae3560229a6
author Zoe Liu <zoeliu@google.com> Wed Feb 21 12:35:33 2018 -0800
committer Zoe Liu <zoeliu@google.com> Thu Feb 22 19:30:29 2018 +0000
tree bd2879a5adb9c5bee2dddf92cd2abba2aefa1fd2
parent 70e6b9dac688df8be1f6b525db63eba0ed8da539

Support frame_refs_signaling for CONFIG_OBU

Add the encoder side bitstream packing changes to support
frame_refs_signaling, for when CONFIG_OBU is on.

Change-Id: I15f4a1aaabe6d1fffe2a29242b19f93b7b5fcdcc

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 99dd67a..4637b67 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4027,6 +4027,10 @@
   aom_wb_write_bit(wb, frame_size_override_flag);
 #endif
 
+#if CONFIG_FRAME_REFS_SIGNALING
+  cm->frame_refs_short_signaling = 0;
+#endif  // CONFIG_FRAME_REFS_SIGNALING
+
   if (cm->frame_type == KEY_FRAME) {
 #if CONFIG_FRAME_SIZE
     write_frame_size(cm, frame_size_override_flag, wb);
@@ -4103,10 +4107,34 @@
       cm->is_reference_frame = 0;
     }
 
+#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)
+      aom_wb_write_bit(wb, cm->frame_refs_short_signaling);
+    else
+      assert(cm->frame_refs_short_signaling == 0);
+
+    if (cm->frame_refs_short_signaling) {
+      assert(get_ref_frame_map_idx(cpi, LAST_FRAME) != INVALID_IDX);
+      aom_wb_write_literal(wb, get_ref_frame_map_idx(cpi, LAST_FRAME),
+                           REF_FRAMES_LOG2);
+      assert(get_ref_frame_map_idx(cpi, GOLDEN_FRAME) != INVALID_IDX);
+      aom_wb_write_literal(wb, get_ref_frame_map_idx(cpi, GOLDEN_FRAME),
+                           REF_FRAMES_LOG2);
+    }
+#endif  // CONFIG_FRAME_REFS_SIGNALING
+
     for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) {
       assert(get_ref_frame_map_idx(cpi, ref_frame) != INVALID_IDX);
-      aom_wb_write_literal(wb, get_ref_frame_map_idx(cpi, ref_frame),
-                           REF_FRAMES_LOG2);
+#if CONFIG_FRAME_REFS_SIGNALING
+      if (!cm->frame_refs_short_signaling)
+#endif  // CONFIG_FRAME_REFS_SIGNALING
+        aom_wb_write_literal(wb, get_ref_frame_map_idx(cpi, ref_frame),
+                             REF_FRAMES_LOG2);
       if (cm->frame_type == S_FRAME) {
         assert(cm->ref_frame_sign_bias[ref_frame] == 0);
       }