commit 4596deb2483ca3eefc81ffa4faf2c60ed3caddec
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Tue Nov 07 18:06:38 2017 +0000
committer Debargha Mukherjee <debargha@google.com> Tue Nov 07 21:27:11 2017 +0000
tree a198e2fd3e1b39583788a00abc968cae9c8262e4
parent 472b174433330ebdb8ca50f386a480bcaef59a64

Use correct RestorationInfo when encoding tilesize

Also, factor out some long constants to avoid line wrapping.

BUG=aomedia:1009

Change-Id: I7850c27d22ef8b927c3554f1083bc7bdf2c7c6b3

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index d2a8c3a..023e568 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2446,10 +2446,8 @@
 #if CONFIG_LOOP_RESTORATION
 static void encode_restoration_mode(AV1_COMMON *cm,
                                     struct aom_write_bit_buffer *wb) {
-  int p;
-  RestorationInfo *rsi;
-  for (p = 0; p < MAX_MB_PLANE; ++p) {
-    rsi = &cm->rst_info[p];
+  for (int p = 0; p < MAX_MB_PLANE; ++p) {
+    RestorationInfo *rsi = &cm->rst_info[p];
     switch (rsi->frame_restoration_type) {
       case RESTORE_NONE:
         aom_wb_write_bit(wb, 0);
@@ -2473,11 +2471,12 @@
   if (cm->rst_info[0].frame_restoration_type != RESTORE_NONE ||
       cm->rst_info[1].frame_restoration_type != RESTORE_NONE ||
       cm->rst_info[2].frame_restoration_type != RESTORE_NONE) {
-    aom_wb_write_bit(
-        wb, rsi->restoration_unit_size != (RESTORATION_TILESIZE_MAX >> 2));
-    if (rsi->restoration_unit_size != (RESTORATION_TILESIZE_MAX >> 2)) {
-      aom_wb_write_bit(
-          wb, rsi->restoration_unit_size != (RESTORATION_TILESIZE_MAX >> 1));
+    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);
     }
   }
   int s = AOMMIN(cm->subsampling_x, cm->subsampling_y);