shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9: fix non bitexact when reuse_inter_pred is 0.

when the best filter selected is not EIGHTTAP_SMOOTH, and
reuse_inter_pred is 0, pred buffer was not pointing to the right place.

Change-Id: I5b519fedd2d892bf140879faa74b463a161e253b

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1501,7 +1501,8 @@

   int best_early_term = 0;

   int best_flag_preduv_computed[2] = { 0 };

   INTERP_FILTER filter_start = force_smooth_filter ? EIGHTTAP_SMOOTH : EIGHTTAP;

-  for (filter = filter_start; filter <= EIGHTTAP_SMOOTH; ++filter) {

+  INTERP_FILTER filter_end = EIGHTTAP_SMOOTH;

+  for (filter = filter_start; filter <= filter_end; ++filter) {

     int64_t cost;

     mi->interp_filter = filter;

     vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);

@@ -1531,9 +1532,11 @@

           free_pred_buffer(*this_mode_pred);

           *this_mode_pred = current_pred;

         }

-        current_pred = &tmp[get_pred_buffer(tmp, 3)];

-        pd->dst.buf = current_pred->data;

-        pd->dst.stride = bw;

+        if (filter != filter_end) {

+          current_pred = &tmp[get_pred_buffer(tmp, 3)];

+          pd->dst.buf = current_pred->data;

+          pd->dst.stride = bw;

+        }

       }

     }

   }

@@ -1554,6 +1557,9 @@

   if (reuse_inter_pred) {

     pd->dst.buf = (*this_mode_pred)->data;

     pd->dst.stride = (*this_mode_pred)->stride;

+  } else if (best_filter < filter_end) {

+    mi->interp_filter = best_filter;

+    vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);

   }

 }