Use intra_ext_tx_cdf when coding tx_type.
When building with --enable-daala_ec, the tx_type for intra blocks can be coded using the CDFs that are updated once per frame. This patch converts a tx_type symbol to be coded with aom_write_symbol() and aom_read_symbol() that was missed in f3e8e267. Change-Id: I34f8fef7525f88e156bbcb78dfc48994367610ce
This commit is contained in:
@@ -718,9 +718,15 @@ static void read_intra_frame_mode_info(AV1_COMMON *const cm,
|
||||
!segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {
|
||||
FRAME_COUNTS *counts = xd->counts;
|
||||
TX_TYPE tx_type_nom = intra_mode_to_tx_type_context[mbmi->mode];
|
||||
#if CONFIG_DAALA_EC
|
||||
mbmi->tx_type = av1_ext_tx_inv[aom_read_symbol(
|
||||
r, cm->fc->intra_ext_tx_cdf[mbmi->tx_size][tx_type_nom], TX_TYPES,
|
||||
ACCT_STR)];
|
||||
#else
|
||||
mbmi->tx_type = aom_read_tree(
|
||||
r, av1_ext_tx_tree,
|
||||
cm->fc->intra_ext_tx_prob[mbmi->tx_size][tx_type_nom], ACCT_STR);
|
||||
#endif
|
||||
if (counts)
|
||||
++counts->intra_ext_tx[mbmi->tx_size][tx_type_nom][mbmi->tx_type];
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user