commit f88bc04941444c9e8b495b7e89e87bc111a78e75
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Wed Oct 18 10:45:51 2017 +0100
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Thu Oct 19 05:04:15 2017 +0000
tree 56f55c2d41991b057e4b7cdf72d64476b5b6858e
parent 64b8bbdf4cae812301e382fa6690e7f0328351e5

Remove RestorationInternal from AV1_COMMON

The bits needed by striped loop restoration are now in
RestorationInfo (which also gets rid of a rather ugly extra
index).

The scratch buffer that's used for self-guided restoration has been
moved up to its own variable (rst_tmpbuf).

All the rest of the fields are now safely hidden inside restoration.c

This patch also does a big cleanup of the initialisation code in
loop_restoration_rows: it doesn't need to be as repetitive now that
the fields of YV12_BUFFER_CONFIG can be accessed by plane index.

Change-Id: Iba7edc0f94041fa053cdeb3d6cf35d84a05dbfaf

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index cc7b665..371e2df 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -157,8 +157,8 @@
     av1_alloc_restoration_struct(cm, &cm->rst_info[p],
                                  ROUND_POWER_OF_TWO(width, cm->subsampling_x),
                                  ROUND_POWER_OF_TWO(height, cm->subsampling_y));
-  aom_free(cm->rst_internal.tmpbuf);
-  CHECK_MEM_ERROR(cm, cm->rst_internal.tmpbuf,
+  aom_free(cm->rst_tmpbuf);
+  CHECK_MEM_ERROR(cm, cm->rst_tmpbuf,
                   (int32_t *)aom_memalign(16, RESTORATION_TMPBUF_SIZE));
 
 #if CONFIG_STRIPED_LOOP_RESTORATION
@@ -172,8 +172,8 @@
     int buf_size = num_stripes * 2 * stride;
     uint8_t *above_buf, *below_buf;
 
-    aom_free(cm->rst_internal.stripe_boundary_above[p]);
-    aom_free(cm->rst_internal.stripe_boundary_below[p]);
+    aom_free(cm->rst_info[p].stripe_boundary_above);
+    aom_free(cm->rst_info[p].stripe_boundary_below);
 
 #if CONFIG_HIGHBITDEPTH
     if (cm->use_highbitdepth) buf_size = buf_size * 2;
@@ -182,9 +182,9 @@
                     (uint8_t *)aom_memalign(1 << align_bits, buf_size));
     CHECK_MEM_ERROR(cm, below_buf,
                     (uint8_t *)aom_memalign(1 << align_bits, buf_size));
-    cm->rst_internal.stripe_boundary_above[p] = above_buf;
-    cm->rst_internal.stripe_boundary_below[p] = below_buf;
-    cm->rst_internal.stripe_boundary_stride[p] = stride;
+    cm->rst_info[p].stripe_boundary_above = above_buf;
+    cm->rst_info[p].stripe_boundary_below = below_buf;
+    cm->rst_info[p].stripe_boundary_stride = stride;
   }
 #endif  // CONFIG_STRIPED_LOOP_RESTORATION
 }
@@ -193,8 +193,8 @@
   int p;
   for (p = 0; p < MAX_MB_PLANE; ++p)
     av1_free_restoration_struct(&cm->rst_info[p]);
-  aom_free(cm->rst_internal.tmpbuf);
-  cm->rst_internal.tmpbuf = NULL;
+  aom_free(cm->rst_tmpbuf);
+  cm->rst_tmpbuf = NULL;
 }
 #endif  // CONFIG_LOOP_RESTORATION