Merge "Remove TX_SIZE_MAX_MB." into experimental

This commit is contained in:
Ronald S. Bultje 2013-05-30 20:58:16 -07:00 committed by Gerrit Code Review
commit 7d549870f7
2 changed files with 3 additions and 4 deletions

View File

@ -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;

View File

@ -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];