From 7a08fe59d0c28d834c5391b0283ca62bbc879bb4 Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Mon, 13 Feb 2017 18:49:29 -0800
Subject: [PATCH] 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 6d98498c6..20df6273b 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -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];
-- 
GitLab