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

Merge "Fix lingering x->skip settings if static_threshold is used." into experimental

Browse Source
This commit is contained in:
Ronald S. Bultje 2013-04-15 14:20:47 -07:00 committed by Gerrit Code Review
commit 1633685725
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_rdopt.c
View File

@ -4169,6 +4169,7 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
int64_t txfm_cache[NB_TXFM_MODES], err; int64_t txfm_cache[NB_TXFM_MODES], err;
int i; int i;
ctx->skip = 0;
xd->mode_info_context->mbmi.mode = DC_PRED; xd->mode_info_context->mbmi.mode = DC_PRED;
err = rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly, err = rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly,
&dist_y, &y_skip, bsize, txfm_cache); &dist_y, &y_skip, bsize, txfm_cache);
@ -4218,6 +4219,7 @@ void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x,
TX_SIZE txfm_size_16x16, txfm_size_8x8; TX_SIZE txfm_size_16x16, txfm_size_8x8;
int i; int i;
x->mb_context[xd->sb_index][xd->mb_index].skip = 0;
mbmi->ref_frame = INTRA_FRAME; mbmi->ref_frame = INTRA_FRAME;
mbmi->mode = DC_PRED; mbmi->mode = DC_PRED;
for (i = 0; i <= TX_8X8; i++) { for (i = 0; i <= TX_8X8; i++) {