Commit ef838c34 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review

Merge "Remove redefinition in handle_inter_mode"

parents 9a005c99 84acc988
......@@ -2748,6 +2748,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
intpel_mv &= (mbmi->mv[1].as_mv.row & 15) == 0 &&
(mbmi->mv[1].as_mv.col & 15) == 0;
// Search for best switchable filter by checking the variance of
// pred error irrespective of whether the filter will be used
if (cm->mcomp_filter_type != BILINEAR) {
......@@ -2757,7 +2758,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
*best_filter = EIGHTTAP;
vp9_zero(cpi->rd_filter_cache);
} else {
int i, newbest;
int newbest;
int tmp_rate_sum = 0;
int64_t tmp_dist_sum = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment