Commit fd873807 authored by Yaowu Xu's avatar Yaowu Xu
Browse files

Update entropy context after trellis quant

BUG=aomedia:110

Change-Id: Icd64aebf61e945ae3ee5f95e463599c77fa55e8a
parent 80433bed
......@@ -1239,8 +1239,13 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col,
coeff_ctx, AV1_XFORM_QUANT_FP);
#endif // CONFIG_NEW_QUANT
#if !CONFIG_PVQ
if (x->plane[plane].eobs[block] && !xd->lossless[mbmi->segment_id])
av1_optimize_b(cm, x, plane, block, tx_size, coeff_ctx);
if (x->plane[plane].eobs[block] && !xd->lossless[mbmi->segment_id]) {
args->t_above[blk_col] = args->t_left[blk_row] =
(av1_optimize_b(cm, x, plane, block, tx_size, coeff_ctx) > 0);
} else {
args->t_above[blk_col] = (x->plane[plane].eobs[block] > 0);
args->t_left[blk_row] = (x->plane[plane].eobs[block] > 0);
}
#endif
dist_block(args->cpi, x, plane, block, blk_row, blk_col, tx_size,
&this_rd_stats.dist, &this_rd_stats.sse);
......@@ -1258,8 +1263,6 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col,
this_rd_stats.rate);
#endif
args->t_above[blk_col] = (x->plane[plane].eobs[block] > 0);
args->t_left[blk_row] = (x->plane[plane].eobs[block] > 0);
#else
this_rd_stats.rate = x->rate;
args->t_above[blk_col] = !x->pvq_skip[plane];
......
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