commit 35bcd517af18688ed8c0d128b109612ca129f700
author Debargha Mukherjee <debargha@google.com> Sat Nov 11 15:10:59 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Sun Nov 12 15:40:02 2017 +0000
tree a670597bcd87ba58131a0c26a75e5c7f5f53f227
parent a2d40a398958df6d6c9742e97aebf2fba671a43e

Fix some loop-restoration valgrind errors

Re-introduces a check that was removed in the refactor in 1a96c3f.

BUG=aomedia:1021
BUG=aomedia:1022

Change-Id: I548a30dba7586cf220b2f5a3f1fddf2b6b57e68d

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index b95ef6d..0266e8e 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -1126,6 +1126,14 @@
   RestorationType best_rtype = RESTORE_NONE;
 
   for (RestorationType r = 0; r < RESTORE_SWITCHABLE_TYPES; ++r) {
+    // Check for the condition that wiener or sgrproj search could not
+    // find a solution or the solution was worse than RESTORE_NONE.
+    // In either case the best_rtype will be set as RESTORE_NONE. These
+    // should be skipped from the test below.
+    if (r > RESTORE_NONE) {
+      if (rusi->best_rtype[r - 1] == RESTORE_NONE) continue;
+    }
+
     const int64_t sse = rusi->sse[r];
     int64_t coeff_pcost = 0;
     switch (r) {
@@ -1134,10 +1142,10 @@
         coeff_pcost =
             count_wiener_bits(wiener_win, &rusi->wiener, &rsc->wiener);
         break;
-      default:
-        assert(r == RESTORE_SGRPROJ);
+      case RESTORE_SGRPROJ:
         coeff_pcost = count_sgrproj_bits(&rusi->sgrproj, &rsc->sgrproj);
         break;
+      default: assert(0); break;
     }
     const int64_t coeff_bits = coeff_pcost << AV1_PROB_COST_SHIFT;
     const int64_t bits = x->switchable_restore_cost[r] + coeff_bits;