commit d621f9bbeb48e7372ca5c0aee02be26928f608ff
author Frederic Barbier <frederic.barbier@allegrodvt.com> Fri Jan 19 12:25:17 2018 +0100
committer Frédéric BARBIER <fbarbier.contact@gmail.com> Mon Jan 22 19:24:01 2018 +0000
tree 285758bb5541b6e71862f36fd2d896761c8b2eae
parent 96d7a6863229e970089f4d34302ed3767b93b8a4

Cleanup useless marker entry in tx_size_2d

This extra entry has been introduced in 3ebb0d009efc13c71adba368065a4bbed1d9dad2
but is not needed.

Change-Id: I22801b2a0677dd5c381175f2fc6d9e86dde1594e

av1/common/common_data.h

diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 57692f7..e501215 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -845,20 +845,20 @@
 #define TX_UNIT_WIDE_LOG2 (MI_SIZE_LOG2 - tx_size_wide_log2[0])
 #define TX_UNIT_HIGH_LOG2 (MI_SIZE_LOG2 - tx_size_high_log2[0])
 
-static const int tx_size_2d[TX_SIZES_ALL + 1] = { 16,   64,   256, 1024,
+static const int tx_size_2d[TX_SIZES_ALL + 1] = {
+  16,   64,   256, 1024,
 #if CONFIG_TX64X64
-                                                  4096,
+  4096,
 #endif  // CONFIG_TX64X64
-                                                  32,   32,   128, 128,
-                                                  512,  512,
+  32,   32,   128, 128,  512, 512,
 #if CONFIG_TX64X64
-                                                  2048, 2048,
+  2048, 2048,
 #endif  // CONFIG_TX64X64
-                                                  64,   64,   256, 256,
+  64,   64,   256, 256,
 #if CONFIG_TX64X64
-                                                  1024, 1024,
+  1024, 1024,
 #endif  // CONFIG_TX64X64
-                                                  32767 };
+};
 
 static const BLOCK_SIZE txsize_to_bsize[TX_SIZES_ALL] = {
   BLOCK_4X4,    // TX_4X4

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index 68fbbcd..f56fd19 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -207,7 +207,12 @@
 #endif                // CONFIG_TX64X64
   TX_SIZES_ALL,       // Includes rectangular transforms
   TX_SIZES = TX_4X8,  // Does NOT include rectangular transforms
-  TX_INVALID = 255    // Invalid transform size
+#if CONFIG_TX64X64
+  TX_SIZES_LARGEST = TX_64X64,
+#else
+  TX_SIZES_LARGEST = TX_32X32,
+#endif
+  TX_INVALID = 255  // Invalid transform size
 #if defined(_MSC_VER)
 };
 #else

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index ad118f4..c396b5e 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -973,7 +973,7 @@
       const TX_SIZE max_tx_size = get_max_rect_tx_size(bsize, 0);
       const int bh = tx_size_high_unit[max_tx_size];
       const int bw = tx_size_wide_unit[max_tx_size];
-      mbmi->min_tx_size = TX_SIZES_ALL;
+      mbmi->min_tx_size = TX_SIZES_LARGEST;
       for (int idy = 0; idy < height; idy += bh) {
         for (int idx = 0; idx < width; idx += bw) {
           read_tx_size_vartx(cm, xd, mbmi, xd->counts, max_tx_size, 0, idy, idx,
@@ -2245,7 +2245,7 @@
     const int width = block_size_wide[bsize] >> tx_size_wide_log2[0];
     const int height = block_size_high[bsize] >> tx_size_wide_log2[0];
 
-    mbmi->min_tx_size = TX_SIZES_ALL;
+    mbmi->min_tx_size = TX_SIZES_LARGEST;
     for (int idy = 0; idy < height; idy += bh)
       for (int idx = 0; idx < width; idx += bw)
         read_tx_size_vartx(cm, xd, mbmi, xd->counts, max_tx_size, 0, idy, idx,