commit 53685900dbd95fd6ae1082ee4c4bdc9a87af69e8
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Fri Oct 27 13:35:19 2017 +0100
committer Yunqing Wang <yunqingwang@google.com> Fri Oct 27 19:11:41 2017 +0000
tree 58c66548c4e86136d2a5f309d17d62cffac20e5a
parent 7546b304122e43f0995c6e5c25d46d68fd8689ab

Fix ext-tile encoding when not using compressed header

The compressed header size is now sometimes not signalled and the
encoder code hadn't been updated to match.

Note: This mistake caused the failing test tracked in bug 917 to fail,
      but fixing it doesn't fix the test: the decoder now staggers on
      a little further before getting out of sync.

BUG=aomedia:917

Change-Id: Ic0de99ede778844c4dbdd34dba3fba9c1fa2d95f

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index b71ba8b..3b95523 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -5299,7 +5299,10 @@
     }
     // TODO(jbb): Figure out what to do if compressed_hdr_size > 16 bits.
     assert(compressed_hdr_size <= 0xffff);
-    aom_wb_write_literal(&saved_wb, compressed_hdr_size, 16);
+    // Fill in the compressed header size (but only if we're using one)
+    if (use_compressed_header(cm)) {
+      aom_wb_write_literal(&saved_wb, compressed_hdr_size, 16);
+    }
   } else {
 #endif  // CONFIG_EXT_TILE
     data += data_size;