commit 1a7099443894d07fdf3acbb7e12ed04c2d62b9c5
author Debargha Mukherjee <debargha@google.com> Fri Feb 02 08:08:46 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Feb 02 19:31:25 2018 +0000
tree f6d842af4ac472f774e2540241f6eea0654a1369
parent d051e56005861ea4c9016871922e0af8df8fb624

Remove code for CONFIG_FAST_SGR=2 and cleanup

Change-Id: I01cecc829e2d57517427a1de6387e91ba3c64312

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index b590833..8491806 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -349,19 +349,6 @@
   xqd[1] = clamp(xqd[1], SGRPROJ_PRJ_MIN1, SGRPROJ_PRJ_MAX1);
 }
 
-static void sgr_filter_block(const sgr_params_type *params, const uint8_t *dat8,
-                             int width, int height, int dat_stride,
-                             int use_highbd, int bit_depth, int32_t *flt1,
-                             int32_t *flt2, int flt_stride) {
-#if CONFIG_FAST_SGR == 2
-  av1_selfguided_restoration_c(dat8, width, height, dat_stride, flt1, flt2,
-                               flt_stride, params, bit_depth, use_highbd);
-#else
-  av1_selfguided_restoration(dat8, width, height, dat_stride, flt1, flt2,
-                             flt_stride, params, bit_depth, use_highbd);
-#endif  // CONFIG_FAST_SGR == 2
-}
-
 // Apply the self-guided filter across an entire restoration unit.
 static void apply_sgr(const sgr_params_type *params, const uint8_t *dat8,
                       int width, int height, int dat_stride, int use_highbd,
@@ -376,8 +363,9 @@
     // Iterate over the stripe in blocks of width pu_width
     for (int j = 0; j < width; j += pu_width) {
       const int w = AOMMIN(pu_width, width - j);
-      sgr_filter_block(params, dat8_row + j, w, h, dat_stride, use_highbd,
-                       bit_depth, flt1_row + j, flt2_row + j, flt_stride);
+      av1_selfguided_restoration(dat8_row + j, w, h, dat_stride, flt1_row + j,
+                                 flt2_row + j, flt_stride, params, bit_depth,
+                                 use_highbd);
     }
   }
 }