commit 76405206328bcf22f0a8ed78b4af56cc3a54ae0a
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Tue Nov 07 16:35:55 2017 +0000
committer Debargha Mukherjee <debargha@google.com> Tue Nov 07 21:34:28 2017 +0000
tree b08c3b447b2f6804c0bef07cecf87837335a83fd
parent b394bfec3a7083cee08fd78f53fb120aef60cd0e

Move loop restoration reset into a helper function

This seems a little cleaner than having the loop open coded in four
places.

Change-Id: I2ce7be2745ba3575f618d9e261ab767d10f551f7

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 06fc10f..22d282d 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3123,10 +3123,7 @@
 #endif
         mode_bc.allow_update_cdf = !cm->large_scale_tile;
 #if CONFIG_LOOP_RESTORATION
-        for (int p = 0; p < MAX_MB_PLANE; ++p) {
-          set_default_wiener(cpi->td.mb.e_mbd.wiener_info + p);
-          set_default_sgrproj(cpi->td.mb.e_mbd.sgrproj_info + p);
-        }
+        av1_reset_loop_restoration(&cpi->td.mb.e_mbd);
 #endif  // CONFIG_LOOP_RESTORATION
 
         aom_start_encode(&mode_bc, buf->data + data_offset);
@@ -3310,10 +3307,7 @@
 #endif  // CONFIG_ANS
         mode_bc.allow_update_cdf = 1;
 #if CONFIG_LOOP_RESTORATION
-        for (int p = 0; p < MAX_MB_PLANE; ++p) {
-          set_default_wiener(cpi->td.mb.e_mbd.wiener_info + p);
-          set_default_sgrproj(cpi->td.mb.e_mbd.sgrproj_info + p);
-        }
+        av1_reset_loop_restoration(&cpi->td.mb.e_mbd);
 #endif  // CONFIG_LOOP_RESTORATION
 
         aom_start_encode(&mode_bc, dst + total_size);
@@ -4884,10 +4878,7 @@
 #endif  // CONFIG_ANS
         mode_bc.allow_update_cdf = 1;
 #if CONFIG_LOOP_RESTORATION
-        for (int p = 0; p < MAX_MB_PLANE; ++p) {
-          set_default_wiener(cpi->td.mb.e_mbd.wiener_info + p);
-          set_default_sgrproj(cpi->td.mb.e_mbd.sgrproj_info + p);
-        }
+        av1_reset_loop_restoration(&cpi->td.mb.e_mbd);
 #endif  // CONFIG_LOOP_RESTORATION
 
         aom_start_encode(&mode_bc, dst + total_size);