diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-30 20:58:16 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-30 20:58:16 -0700 |
| commit | 7d549870f7c2390d57af98d5bd6d4b0e2e32793b (patch) | |
| tree | 7b3a5e55c2442bf6b550730cc979bb7ba4bbf049 /vp9 | |
| parent | 6ea6f4d2539d907003438f4f60fc6e5bafeefd1f (diff) | |
| parent | 4d3d00b195393647fb4cc7844fb0de57b48a35de (diff) | |
| download | libvpx-7d549870f7c2390d57af98d5bd6d4b0e2e32793b.tar libvpx-7d549870f7c2390d57af98d5bd6d4b0e2e32793b.tar.gz libvpx-7d549870f7c2390d57af98d5bd6d4b0e2e32793b.tar.bz2 libvpx-7d549870f7c2390d57af98d5bd6d4b0e2e32793b.zip | |
Merge "Remove TX_SIZE_MAX_MB." into experimental
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 3 | ||||
| -rw-r--r-- | 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 54d19f518..4456fd983 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 460ed93a5..43908b981 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]; |