commit 7a08fe59d0c28d834c5391b0283ca62bbc879bb4
author Yaowu Xu <yaowu@google.com> Mon Feb 13 18:49:29 2017 -0800
committer Yaowu Xu <yaowu@google.com> Thu Feb 16 17:40:49 2017 +0000
tree 5d9da7697dec682a2bb67e5d506332ff653a2426
parent f769c4e1f835011e9375dca3725215aca840ef95

unify the way to count tx_size in encode&decode

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

Change-Id: I727c27a412c21695eb3c084f8dd688163615efe3

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 6d98498..20df627 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5811,7 +5811,10 @@
       }
     }
 #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];