commit b1dce0a6b3e159fa39eda3a176aeecccb788d6f5
author Imdad Sardharwalla <imdad.sardharwalla@argondesign.com> Mon Feb 12 16:43:59 2018 +0000
committer Imdad Sardharwalla <imdad.sardharwalla@argondesign.com> Tue Feb 13 11:33:17 2018 +0000
tree be224b5fa4e57266712427cf3af3baeb8bcde5df
parent 36a9f0c31007e0f6a4936587eef38702885e35a3

[normative] Ensure LRU size >= superblock size

This patch changes the bit stream slightly to make it impossible to code a loop
restoration unit size that is smaller than the superblock size.

BUG=aomedia:1291

Change-Id: I59637177ccb481d45c2108b0fea624a952e0cd03

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 5d10716..1cf7601 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2198,6 +2198,7 @@
                                     struct aom_write_bit_buffer *wb) {
   const int num_planes = av1_num_planes(cm);
 #if CONFIG_INTRABC
+
   if (cm->allow_intrabc && NO_FILTER_FOR_IBC) return;
 #endif  // CONFIG_INTRABC
   int all_none = 1, chroma_none = 1;
@@ -2228,12 +2229,20 @@
     }
   }
   if (!all_none) {
+    assert(cm->seq_params.sb_size == BLOCK_64X64 ||
+           cm->seq_params.sb_size == BLOCK_128X128);
+    const int sb_size = cm->seq_params.sb_size == BLOCK_128X128 ? 128 : 64;
+
     RestorationInfo *rsi = &cm->rst_info[0];
-    const int qsize = RESTORATION_TILESIZE_MAX >> 2;
-    const int hsize = RESTORATION_TILESIZE_MAX >> 1;
-    aom_wb_write_bit(wb, rsi->restoration_unit_size != qsize);
-    if (rsi->restoration_unit_size != qsize) {
-      aom_wb_write_bit(wb, rsi->restoration_unit_size != hsize);
+
+    assert(rsi->restoration_unit_size >= sb_size);
+    assert(RESTORATION_TILESIZE_MAX == 256);
+
+    if (sb_size == 64) {
+      aom_wb_write_bit(wb, rsi->restoration_unit_size > 64);
+    }
+    if (rsi->restoration_unit_size > 64) {
+      aom_wb_write_bit(wb, rsi->restoration_unit_size > 128);
     }
   }