Refactor av1_set_contexts() Change-Id: I7b3e747f5cd8a06ab359475388b894699f8bd36f
diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c index 197f570..8d3770f 100644 --- a/av1/encoder/encodetxb.c +++ b/av1/encoder/encodetxb.c
@@ -1688,10 +1688,9 @@ const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col, tx_size, cm->reduced_tx_set_used); const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type); - (void)plane_bsize; - - int cul_level = av1_get_txb_entropy_context(qcoeff, scan_order, eob); - av1_set_contexts(xd, pd, plane, tx_size, cul_level, blk_col, blk_row); + const int cul_level = av1_get_txb_entropy_context(qcoeff, scan_order, eob); + av1_set_contexts(xd, pd, plane, plane_bsize, tx_size, cul_level, blk_col, + blk_row); } void av1_update_and_record_txb_context(int plane, int block, int blk_row, @@ -1732,7 +1731,7 @@ x->mbmi_ext->eobs[plane][block] = eob; if (eob == 0) { - av1_set_contexts(xd, pd, plane, tx_size, 0, blk_col, blk_row); + av1_set_contexts(xd, pd, plane, plane_bsize, tx_size, 0, blk_col, blk_row); return; } @@ -1832,7 +1831,8 @@ } const int cul_level = av1_get_txb_entropy_context(tcoeff, scan_order, eob); - av1_set_contexts(xd, pd, plane, tx_size, cul_level, blk_col, blk_row); + av1_set_contexts(xd, pd, plane, plane_bsize, tx_size, cul_level, blk_col, + blk_row); } void av1_update_txb_context(const AV1_COMP *cpi, ThreadData *td,