From: Jingning Han <jingning@google.com>
Date: Thu, 15 Oct 2015 19:47:22 +0000 (-0700)
Subject: Turn off fixed tx size in frame header
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88b9e90a5631184fc6f7be93ec9391cc61c41286;p=libvpx

Turn off fixed tx size in frame header

Temporarily turn off the fixed transform size at frame level.

Change-Id: I94a6a3b18893909d33fb7fa91e73ee3568b537b2
---

diff --git a/vp10/decoder/decodemv.c b/vp10/decoder/decodemv.c
index a4fb8de22..ef74c871e 100644
--- a/vp10/decoder/decodemv.c
+++ b/vp10/decoder/decodemv.c
@@ -787,8 +787,7 @@ static void read_inter_frame_mode_info(VP10Decoder *const pbi,
                            idy, idx, r);
     if (xd->counts) {
       const int ctx = get_tx_size_context(xd);
-      inter_block_tx_count_update(cm, xd, mbmi, bsize,
-                                  ctx, &xd->counts->tx);
+      ++get_tx_counts(max_tx_size, ctx, &xd->counts->tx)[mbmi->tx_size];
     }
   } else {
     mbmi->tx_size = read_tx_size(cm, xd, !mbmi->skip || !inter_block, r);
diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c
index 32f00f750..aa51c4480 100644
--- a/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -2972,6 +2972,7 @@ void vp10_encode_frame(VP10_COMP *cpi) {
       }
     }
 
+#if !CONFIG_VAR_TX
     if (cm->tx_mode == TX_MODE_SELECT) {
       int count4x4 = 0;
       int count8x8_lp = 0, count8x8_8x8p = 0;
@@ -3006,6 +3007,7 @@ void vp10_encode_frame(VP10_COMP *cpi) {
         reset_skip_tx_size(cm, TX_16X16);
       }
     }
+#endif
   } else {
     cm->reference_mode = SINGLE_REFERENCE;
     encode_frame_internal(cpi);
@@ -3261,20 +3263,11 @@ static void encode_superblock(VP10_COMP *cpi, ThreadData *td,
         mbmi->sb_type >= BLOCK_8X8  &&
         !(is_inter_block(mbmi) && (mbmi->skip || seg_skip))) {
 #if CONFIG_VAR_TX
-      int tx_size_ctx = get_tx_size_context(xd);
-      if (is_inter_block(mbmi)) {
-        tx_partition_count_update(cm, xd, bsize, mi_row, mi_col,
-                                  td->counts);
-        inter_block_tx_count_update(cm, xd, mbmi, bsize,
-                                    tx_size_ctx, &td->counts->tx);
-      } else {
-        ++get_tx_counts(max_txsize_lookup[bsize], get_tx_size_context(xd),
-                        &td->counts->tx)[mbmi->tx_size];
-      }
-#else
+      if (is_inter_block(mbmi))
+        tx_partition_count_update(cm, xd, bsize, mi_row, mi_col, td->counts);
+#endif
       ++get_tx_counts(max_txsize_lookup[bsize], get_tx_size_context(xd),
                       &td->counts->tx)[mbmi->tx_size];
-#endif
     } else {
       int x, y;
       TX_SIZE tx_size;