Commit 16336857 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Gerrit Code Review

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

parents f7d43d21 33a8df08
......@@ -4169,6 +4169,7 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
int64_t txfm_cache[NB_TXFM_MODES], err;
int i;
ctx->skip = 0;
xd->mode_info_context->mbmi.mode = DC_PRED;
err = rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly,
&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;
int i;
x->mb_context[xd->sb_index][xd->mb_index].skip = 0;
mbmi->ref_frame = INTRA_FRAME;
mbmi->mode = DC_PRED;
for (i = 0; i <= TX_8X8; i++) {
......
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