commit 5105f7acb1feaea3e99736795332761105b311aa
author Debargha Mukherjee <debargha@google.com> Mon Jan 29 16:05:54 2018 -0800
committer Urvang Joshi <urvang@google.com> Wed Jan 31 18:26:04 2018 +0000
tree d14959aeab441092d2bc8d15cca119d9056a769f
parent 1e3da46359eccd8af80f0af2490e37d4a95eeeba

Merge in STRIPED_LOOP_RESTORATION flag

CONFIG_LOOP_RESTORATION still exists.
Only CONFIG_STRIPED_LOOP_RESTORATION has been merged into
CONFIG_LOOP_RESTORATION as always 1.

Change-Id: I37d7a1fcd4cbb56e2fc037b1568ae63f72ed6a66

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index c4a5121..e8b40c0 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -98,10 +98,7 @@
   // sse and bits are initialised by reset_rsc in search_rest_type
   int64_t sse;
   int64_t bits;
-
-#if CONFIG_STRIPED_LOOP_RESTORATION
   int tile_y0, tile_stripe0;
-#endif
 
   // sgrproj and wiener are initialised by rsc_on_tile when starting the first
   // tile in the frame.
@@ -116,12 +113,8 @@
   set_default_sgrproj(&rsc->sgrproj);
   set_default_wiener(&rsc->wiener);
 
-#if CONFIG_STRIPED_LOOP_RESTORATION
   rsc->tile_stripe0 =
       (tile_row == 0) ? 0 : rsc->cm->rst_end_stripe[tile_row - 1];
-#else
-  (void)tile_row;
-#endif
 }
 
 static void reset_rsc(RestSearchCtxt *rsc) {
@@ -158,21 +151,15 @@
   const AV1_COMMON *const cm = rsc->cm;
   const int plane = rsc->plane;
   const int is_uv = plane > 0;
-#if CONFIG_STRIPED_LOOP_RESTORATION
   const RestorationInfo *rsi = &cm->rst_info[plane];
   RestorationLineBuffers rlbs;
-#else
-  (void)tile_rect;
-#endif
   const int bit_depth = cm->bit_depth;
   const int highbd = cm->use_highbitdepth;
 
   const YV12_BUFFER_CONFIG *fts = cm->frame_to_show;
 
   av1_loop_restoration_filter_unit(
-      limits, rui,
-#if CONFIG_STRIPED_LOOP_RESTORATION
-      &rsi->boundaries, &rlbs, tile_rect, rsc->tile_stripe0,
+      limits, rui, &rsi->boundaries, &rlbs, tile_rect, rsc->tile_stripe0,
 #if CONFIG_LOOPFILTERING_ACROSS_TILES
 #if CONFIG_LOOPFILTERING_ACROSS_TILES_EXT
       cm->loop_filter_across_tiles_v_enabled,
@@ -181,7 +168,6 @@
       cm->loop_filter_across_tiles_enabled,
 #endif  // CONFIG_LOOPFILTERING_ACROSS_TILES_EXT
 #endif  // CONFIG_LOOPFILTERING_ACROSS_TILES
-#endif  // CONFIG_STRIPED_LOOP_RESTORATION
       is_uv && cm->subsampling_x, is_uv && cm->subsampling_y, highbd, bit_depth,
       fts->buffers[plane], fts->strides[is_uv], rsc->dst->buffers[plane],
       rsc->dst->strides[is_uv], cm->rst_tmpbuf);