Commit 7a08fe59 authored by Yaowu Xu's avatar Yaowu Xu

unify the way to count tx_size in encode&decode

This fixes a enc/dec mismatch.
BUG=aomedia:354

Change-Id: I727c27a412c21695eb3c084f8dd688163615efe3
parent f769c4e1
......@@ -5811,7 +5811,10 @@ static void encode_superblock(const AV1_COMP *const cpi, ThreadData *td,
}
}
#else
if (tx_size < TX_32X32 && cm->base_qindex > 0 && !mbmi->skip &&
if (tx_size < TX_32X32 &&
((!cm->seg.enabled && cm->base_qindex > 0) ||
(cm->seg.enabled && xd->qindex[mbmi->segment_id] > 0)) &&
!mbmi->skip &&
!segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {
if (is_inter) {
++td->counts->inter_ext_tx[tx_size][mbmi->tx_type];
......
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