commit cb493d822ed873fda9bfd5721cdeb2ac4e044ce4
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Thu Nov 02 10:22:10 2017 +0000
committer Rupert Swarbrick <rupert.swarbrick@argondesign.com> Thu Nov 02 17:09:52 2017 +0000
tree 003417927e7ad9f3a61845f9a5be343147d1971e
parent 238a6d6350c68b94a9cd8c62852232f2ea7dafc5

Get rid of RestorationInfo::procunit_height and width

These are just RESTORATION_PROC_UNIT_SIZE shifted right by the
vertical or horizontal subsampling for this plane and it's easier not
to have to pass them around.

Change-Id: I86441d6cd86bb146f3e5dcdf2c89e34dd9fed0e1

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index 5e310b2..18e03a8 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -75,11 +75,10 @@
                                     const RestorationTileLimits *limits,
                                     const RestorationUnitInfo *rui,
                                     YV12_BUFFER_CONFIG *dst, int plane) {
-  const RestorationInfo *rsi = &cm->rst_info[plane];
   const int is_uv = plane > 0;
 #if CONFIG_STRIPED_LOOP_RESTORATION
+  const RestorationInfo *rsi = &cm->rst_info[plane];
   RestorationLineBuffers rlbs;
-  const int ss_y = is_uv && cm->subsampling_y;
 #endif
 #if CONFIG_HIGHBITDEPTH
   const int bit_depth = cm->bit_depth;
@@ -91,14 +90,14 @@
 
   const YV12_BUFFER_CONFIG *fts = cm->frame_to_show;
 
-  av1_loop_restoration_filter_unit(limits, rui,
+  av1_loop_restoration_filter_unit(
+      limits, rui,
 #if CONFIG_STRIPED_LOOP_RESTORATION
-                                   &rsi->boundaries, &rlbs, ss_y,
+      &rsi->boundaries, &rlbs,
 #endif
-                                   rsi->procunit_width, rsi->procunit_height,
-                                   highbd, bit_depth, fts->buffers[plane],
-                                   fts->strides[is_uv], dst->buffers[plane],
-                                   dst->strides[is_uv], cm->rst_tmpbuf);
+      is_uv && cm->subsampling_x, is_uv && cm->subsampling_y, highbd, bit_depth,
+      fts->buffers[plane], fts->strides[is_uv], dst->buffers[plane],
+      dst->strides[is_uv], cm->rst_tmpbuf);
 
   return sse_restoration_tile(limits, src, dst, plane, highbd);
 }
@@ -472,8 +471,6 @@
 
   const MACROBLOCK *const x = rsc->x;
   const AV1_COMMON *const cm = rsc->cm;
-  const RestorationInfo *rsi = &cm->rst_info[rsc->plane];
-
 #if CONFIG_HIGHBITDEPTH
   const int highbd = cm->use_highbitdepth;
   const int bit_depth = cm->bit_depth;
@@ -487,11 +484,17 @@
   const uint8_t *src_start =
       rsc->src_buffer + limits->v_start * rsc->src_stride + limits->h_start;
 
+  const int is_uv = rsc->plane > 0;
+  const int ss_x = is_uv && cm->subsampling_x;
+  const int ss_y = is_uv && cm->subsampling_y;
+  const int procunit_width = RESTORATION_PROC_UNIT_SIZE >> ss_x;
+  const int procunit_height = RESTORATION_PROC_UNIT_SIZE >> ss_y;
+
   rusi->sgrproj = search_selfguided_restoration(
       dgd_start, limits->h_end - limits->h_start,
       limits->v_end - limits->v_start, rsc->dgd_stride, src_start,
-      rsc->src_stride, highbd, bit_depth, rsi->procunit_width,
-      rsi->procunit_height, cm->rst_tmpbuf);
+      rsc->src_stride, highbd, bit_depth, procunit_width, procunit_height,
+      cm->rst_tmpbuf);
 
   RestorationUnitInfo rui;
   rui.restoration_type = RESTORE_SGRPROJ;