From 4d3d00b195393647fb4cc7844fb0de57b48a35de Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@google.com>
Date: Thu, 30 May 2013 16:17:41 -0700
Subject: [PATCH] Remove TX_SIZE_MAX_MB.
Change-Id: I715870513d1fef8471bfd0f5218a79360a1ef126
---
vp9/common/vp9_blockd.h | 3 +--
vp9/encoder/vp9_onyx_int.h | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index 54d19f5180..4456fd983e 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -105,8 +105,7 @@ typedef enum {
TX_4X4 = 0, // 4x4 dct transform
TX_8X8 = 1, // 8x8 dct transform
TX_16X16 = 2, // 16x16 dct transform
- TX_SIZE_MAX_MB = 3, // Number of different transforms available
- TX_32X32 = TX_SIZE_MAX_MB, // 32x32 dct transform
+ TX_32X32 = 3, // 32x32 dct transform
TX_SIZE_MAX_SB, // Number of transforms available to SBs
} TX_SIZE;
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index cb787866e0..61b8907e6b 100644
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -334,8 +334,8 @@ typedef struct VP9_COMP {
int single_pred_count[COMP_PRED_CONTEXTS];
// FIXME contextualize
int txfm_count_32x32p[TX_SIZE_MAX_SB];
- int txfm_count_16x16p[TX_SIZE_MAX_MB];
- int txfm_count_8x8p[TX_SIZE_MAX_MB - 1];
+ int txfm_count_16x16p[TX_SIZE_MAX_SB - 1];
+ int txfm_count_8x8p[TX_SIZE_MAX_SB - 2];
int64_t rd_tx_select_diff[NB_TXFM_MODES];
int rd_tx_select_threshes[4][NB_TXFM_MODES];
--
GitLab