commit 17bdcdfbb0eef0f29ed0be5876f31ca0c8be8fa6
author Zoe Liu <zoeliu@google.com> Fri Mar 09 15:06:58 2018 -0800
committer Zoe Liu <zoeliu@google.com> Mon Mar 12 12:41:34 2018 +0000
tree 09abee515b803d2162933d971eb842edf4aa52b6
parent 155120f44aad2fce30f5a8a4ba2a15653e0e2f8f

[NORMATIVE] order_hint_bits_minus1

For the adopted EXPLICIT_ORDER_HINT:

* The number of bits for OrderHint is enforced to be 1, hence
  order_hint_bits_minus1 is signaled;

* Signaling of order_hint_bits_minus1 depends on the value of
  enable_order_hint in the sequence header;

* When enable_order_hint is off, order_hint_bits_minus1 is -1
  by default.

BUG=aomedia:1497

Change-Id: I8164fd75f118aae962172ad6fec1f905438ed6ec

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index b22396d..44a9976 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2843,7 +2843,8 @@
 #endif
 
 #if CONFIG_EXPLICIT_ORDER_HINT
-  aom_wb_write_literal(wb, seq_params->order_hint_bits, 3);
+  if (seq_params->enable_order_hint)
+    aom_wb_write_literal(wb, seq_params->order_hint_bits_minus1, 3);
 #endif
 }
 
@@ -3072,8 +3073,8 @@
 #endif  // CONFIG_FRAME_REFS_SIGNALING
 
 #if CONFIG_EXPLICIT_ORDER_HINT
-  aom_wb_write_literal(wb, cm->frame_offset, cm->seq_params.order_hint_bits);
-  // assert(cm->current_video_frame == cm->frame_offset);
+  aom_wb_write_literal(wb, cm->frame_offset,
+                       cm->seq_params.order_hint_bits_minus1 + 1);
 #else
   if (cm->show_frame == 0) {
     int arf_offset = AOMMIN(

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 80b2e10..0d9c19a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4382,7 +4382,7 @@
     cm->frame_offset = cm->current_video_frame;
   }
 #if CONFIG_EXPLICIT_ORDER_HINT
-  cm->frame_offset %= (1 << cm->seq_params.order_hint_bits);
+  cm->frame_offset %= (1 << (cm->seq_params.order_hint_bits_minus1 + 1));
 #endif  // CONFIG_EXPLICIT_ORDER_HINT
   av1_setup_frame_buf_refs(cm);
   if (cpi->sf.selective_ref_frame >= 2) enforce_max_ref_frames(cpi);

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 0005390..0c1a74a 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2562,7 +2562,7 @@
   cm->allow_filter_intra = 1;
 
 #if CONFIG_EXPLICIT_ORDER_HINT
-  cm->seq_params.order_hint_bits = DEFAULT_EXPLICIT_ORDER_HINT_BITS;
+  cm->seq_params.order_hint_bits_minus1 = DEFAULT_EXPLICIT_ORDER_HINT_BITS - 1;
 #endif  // CONFIG_EXPLICIT_ORDER_HINT
   cm->seq_params.enable_dual_filter = oxcf->enable_dual_filter;
   cm->seq_params.enable_order_hint = oxcf->enable_order_hint;