Use tx_size table in level map coding functions Change-Id: I215c4bed9ba5c7f4fc93533249610217de14ce54
diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c index c78fc4d..a6c8cdf 100644 --- a/av1/decoder/decodetxb.c +++ b/av1/decoder/decodetxb.c
@@ -49,7 +49,7 @@ const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, is_inter_block(mbmi)); const int16_t *scan = scan_order->scan; - const int seg_eob = 16 << (tx_size << 1); + const int seg_eob = tx_size_2d[tx_size]; int c = 0; int update_eob = -1; const int16_t *const dequant = xd->plane[plane].seg_dequant[mbmi->segment_id];
diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c index 67c733c..85e71c0 100644 --- a/av1/encoder/encodetxb.c +++ b/av1/encoder/encodetxb.c
@@ -79,7 +79,7 @@ int c; int is_nz; const int bwl = b_width_log2_lookup[txsize_to_bsize[tx_size]] + 2; - const int seg_eob = 16 << (tx_size << 1); + const int seg_eob = tx_size_2d[tx_size]; uint8_t txb_mask[32 * 32] = { 0 }; uint16_t update_eob = 0; @@ -255,7 +255,7 @@ const int eob = p->eobs[block]; const tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block); int c, cost; - const int seg_eob = AOMMIN(eob, (16 << (tx_size << 1)) - 1); + const int seg_eob = AOMMIN(eob, tx_size_2d[tx_size] - 1); int txb_skip_ctx = txb_ctx->txb_skip_ctx; aom_prob *nz_map = xd->fc->nz_map[tx_size][plane_type];