commit acd41f92fdaa82a09a9bed06389ea6866c464386
author Debargha Mukherjee <debargha@google.com> Wed Apr 11 07:58:34 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Wed Apr 11 22:05:46 2018 +0000
tree 05d8f5897c649ee5a876abf952d1174fb0249d40
parent 086b41fd92aa0948f14c21313febd2c4c41f12c9

[NORMATIVE] Send level for still pictures

This was missed in the original patch.

BUG=aomedia:1725

Change-Id: I38a307748ad2bc87e931123767eb9a23d3fa2361

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 75048cc..efa5c29 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3459,13 +3459,17 @@
   // whether to use reduced still picture header
   aom_wb_write_bit(&wb, cm->seq_params.reduced_still_picture_hdr);
 
-  if (!cm->seq_params.reduced_still_picture_hdr) {
+  if (cm->seq_params.reduced_still_picture_hdr) {
+    aom_wb_write_literal(&wb, 0, LEVEL_BITS);  // level[0]
+  } else {
     uint8_t operating_points_minus1_cnt = enhancement_layers_cnt;
-    aom_wb_write_literal(&wb, operating_points_minus1_cnt, 5);
+    aom_wb_write_literal(&wb, operating_points_minus1_cnt,
+                         OP_POINTS_MINUS1_BITS);
     int i;
     for (i = 0; i < operating_points_minus1_cnt + 1; i++) {
-      aom_wb_write_literal(&wb, 0, 12);  // operating_point_idc[i]
-      aom_wb_write_literal(&wb, 0, 4);   // level[i]
+      aom_wb_write_literal(&wb, 0,
+                           OP_POINTS_IDC_BITS);  // operating_point_idc[i]
+      aom_wb_write_literal(&wb, 0, LEVEL_BITS);  // level[i]
 #if !CONFIG_BUFFER_MODEL
       aom_wb_write_literal(&wb, 0, 1);  // decoder_rate_model_present_flag[i]
 #endif