Disable loop restoration when LPF_PICK_MINIMAL_LPF.

The speed feature sf->lpf_picl == LPF_PICK_MINIMAL_LPF is used
to disable loop filtering. This did not work with the loop-restoration
experiment, but now it is respected.

Note that this speed feature is only used in real-time cpu-used >= 8
settings.

Change-Id: I193723c9ac5f802ec31d8c8b4d37650796e065fd

diff --git a/vp10/encoder/pickrst.c b/vp10/encoder/pickrst.c
index 4579eaa178cc58d64085d3c812d738ffe07a83df..000271491bebe50921d97c95397abb19782c0a9d 100644 (file)
--- a/vp10/encoder/pickrst.c
+++ b/vp10/encoder/pickrst.c
@@ -601,6 +601,7 @@ void vp10_pick_filter_restoration(
 
   if (method == LPF_PICK_MINIMAL_LPF && lf->filter_level) {
       lf->filter_level = 0;
+      cm->rst_info.restoration_type = RESTORE_NONE;
   } else if (method >= LPF_PICK_FROM_Q) {
     const int min_filter_level = 0;
     const int max_filter_level = vp10_get_max_filter_level(cpi);