Fix bugs in palette and intrabc expt

palette expt: correctly update color buffer
intrabc expt: update zcoeff_blk so that residue coding will not
              be mistakenly skipped

Change-Id: I870f5b742c2ac394f4c871aa65e6591e293d8ef6
This commit is contained in:
hui su 2015-04-24 14:01:31 -07:00
parent 98d4f09a7a
commit 761cd0b010

View File

@ -5693,16 +5693,18 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
ctx->mic = *xd->mi[0].src_mi;
rd_cost->rdcost =
RDCOST(x->rdmult, x->rddiv, rd_cost->rate, rd_cost->dist);
vpx_memcpy(ctx->zcoeff_blk, x->zcoeff_blk[ctx->mic.mbmi.tx_size],
sizeof(uint8_t) * ctx->num_4x4_blk);
}
}
#endif // CONFIG_INTRABC
#if CONFIG_PALETTE
if (xd->mi[0].src_mi->mbmi.palette_enabled[0]) {
if (ctx->mic.mbmi.palette_enabled[0]) {
vp9_palette_color_insertion(ctx->palette_colors_buf,
&ctx->palette_buf_size,
ctx->palette_count_buf,
&(xd->mi[0].src_mi->mbmi));
&(ctx->mic.mbmi));
}
#endif // CONFIG_PALETTE
}