shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_picklpf: search_filter_level: remove filt_err"

--- a/vp9/encoder/vp9_picklpf.c

+++ b/vp9/encoder/vp9_picklpf.c

@@ -77,7 +77,6 @@

   while (filter_step > 0) {

     const int filt_high = MIN(filt_mid + filter_step, max_filter_level);

     const int filt_low = MAX(filt_mid - filter_step, min_filter_level);

-    int filt_err;

     // Bias against raising loop filter in favor of lowering it.

     int bias = (best_err >> (15 - (filt_mid / 8))) * filter_step;

@@ -92,17 +91,14 @@

     if (filt_direction <= 0 && filt_low != filt_mid) {

       // Get Low filter error score

       if (ss_err[filt_low] < 0) {

-        filt_err = try_filter_frame(sd, cpi, filt_low, partial_frame);

-        ss_err[filt_low] = filt_err;

-      } else {

-        filt_err = ss_err[filt_low];

+        ss_err[filt_low] = try_filter_frame(sd, cpi, filt_low, partial_frame);

       }

       // If value is close to the best so far then bias towards a lower loop

       // filter value.

-      if ((filt_err - bias) < best_err) {

+      if ((ss_err[filt_low] - bias) < best_err) {

         // Was it actually better than the previous best?

-        if (filt_err < best_err)

-          best_err = filt_err;

+        if (ss_err[filt_low] < best_err)

+          best_err = ss_err[filt_low];

         filt_best = filt_low;

       }

@@ -111,14 +107,11 @@

     // Now look at filt_high

     if (filt_direction >= 0 && filt_high != filt_mid) {

       if (ss_err[filt_high] < 0) {

-        filt_err = try_filter_frame(sd, cpi, filt_high, partial_frame);

-        ss_err[filt_high] = filt_err;

-      } else {

-        filt_err = ss_err[filt_high];

+        ss_err[filt_high] = try_filter_frame(sd, cpi, filt_high, partial_frame);

       }

       // Was it better than the previous best?

-      if (filt_err < (best_err - bias)) {

-        best_err = filt_err;

+      if (ss_err[filt_high] < (best_err - bias)) {

+        best_err = ss_err[filt_high];

         filt_best = filt_high;

       }

     }