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

Merge "Properly reset the block coding skip flag array in non-RD mode"

parents e6058ea0 a2e711ce
...@@ -2887,6 +2887,7 @@ static void encode_frame_internal(VP9_COMP *cpi) { ...@@ -2887,6 +2887,7 @@ static void encode_frame_internal(VP9_COMP *cpi) {
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][0]; pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][0];
p[i].eobs = ctx->eobs_pbuf[i][0]; p[i].eobs = ctx->eobs_pbuf[i][0];
} }
vp9_zero(x->zcoeff_blk);
} }
{ {
...@@ -3177,6 +3178,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, ...@@ -3177,6 +3178,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
x->use_lp32x32fdct = cpi->sf.use_lp32x32fdct; x->use_lp32x32fdct = cpi->sf.use_lp32x32fdct;
x->skip_encode = (!output_enabled && cpi->sf.skip_encode_frame && x->skip_encode = (!output_enabled && cpi->sf.skip_encode_frame &&
x->q_index < QIDX_SKIP_THRESH); x->q_index < QIDX_SKIP_THRESH);
if (x->skip_encode) if (x->skip_encode)
return; return;
......
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