Commit 45658120 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Compute prediction filter type cost only when needed"

parents 93d9c504 25206e7b
...@@ -1347,9 +1347,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -1347,9 +1347,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
model_rd_for_sb_y(cpi, bsize, x, xd, &this_rdc.rate, &this_rdc.dist, model_rd_for_sb_y(cpi, bsize, x, xd, &this_rdc.rate, &this_rdc.dist,
&var_y, &sse_y); &var_y, &sse_y);
} }
this_rdc.rate +=
cm->interp_filter == SWITCHABLE ?
vp9_get_switchable_rate(cpi, xd) : 0;
} }
if (!this_early_term) { if (!this_early_term) {
...@@ -1375,6 +1372,8 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -1375,6 +1372,8 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
this_rdc.rate += vp9_get_switchable_rate(cpi, xd); this_rdc.rate += vp9_get_switchable_rate(cpi, xd);
} }
} else { } else {
this_rdc.rate += cm->interp_filter == SWITCHABLE ?
vp9_get_switchable_rate(cpi, xd) : 0;
this_rdc.rate += vp9_cost_bit(vp9_get_skip_prob(cm, xd), 1); this_rdc.rate += vp9_cost_bit(vp9_get_skip_prob(cm, xd), 1);
} }
......
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