ref: 7d549870f7c2390d57af98d5bd6d4b0e2e32793b
parent: 6ea6f4d2539d907003438f4f60fc6e5bafeefd1f
parent: 4d3d00b195393647fb4cc7844fb0de57b48a35de
author: Ronald S. Bultje <rbultje@google.com>
date: Thu May 30 16:58:16 EDT 2013
Merge "Remove TX_SIZE_MAX_MB." into experimental
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -105,8 +105,7 @@
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;
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -334,8 +334,8 @@
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];