generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Reuse inter prediction pixel block for Hadamard transform"

Browse Source
This commit is contained in:
Jingning Han
2015-03-30 16:09:38 -07:00
committed by Gerrit Code Review
parent f0ac5aaa08 8a927a1b7a
commit 9b99eb2e12
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vp9/encoder/vp9_pickmode.c
View File

@@ -1050,6 +1050,10 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
var_y = pf_var[best_filter]; var_y = pf_var[best_filter];
sse_y = pf_sse[best_filter]; sse_y = pf_sse[best_filter];
x->skip_txfm[0] = skip_txfm; x->skip_txfm[0] = skip_txfm;
if (reuse_inter_pred) {
pd->dst.buf = this_mode_pred->data;
pd->dst.stride = this_mode_pred->stride;
}
} else { } else {
mbmi->interp_filter = (filter_ref == SWITCHABLE) ? EIGHTTAP : filter_ref; mbmi->interp_filter = (filter_ref == SWITCHABLE) ? EIGHTTAP : filter_ref;
vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize); vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);
@@ -1075,7 +1079,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// this_rdc.dist += uv_dist; // this_rdc.dist += uv_dist;
// } // }
vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);
block_yrd(cpi, x, &this_rdc.rate, &this_rdc.dist, &is_skippable, &this_sse, block_yrd(cpi, x, &this_rdc.rate, &this_rdc.dist, &is_skippable, &this_sse,
0, bsize, mbmi->tx_size); 0, bsize, mbmi->tx_size);
x->skip_txfm[0] = is_skippable; x->skip_txfm[0] = is_skippable;