diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-09-11 13:40:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-11 13:40:11 -0700 |
| commit | d09abfa9f78f2d0567932de8cad5e6b8a81dc860 (patch) | |
| tree | d4734da72a606fa04ed7c9df5d69ae1f54ba7f07 /vp9/encoder/vp9_encodeframe.c | |
| parent | 079183c1a804b9ffbd2a2466c367b0b1ece34eb8 (diff) | |
| parent | 9faa7e818600c71794deed2765840a3ba3022677 (diff) | |
| download | libvpx-d09abfa9f78f2d0567932de8cad5e6b8a81dc860.tar libvpx-d09abfa9f78f2d0567932de8cad5e6b8a81dc860.tar.gz libvpx-d09abfa9f78f2d0567932de8cad5e6b8a81dc860.tar.bz2 libvpx-d09abfa9f78f2d0567932de8cad5e6b8a81dc860.zip | |
Merge "resolve clang issue : implicit convert tx_mode -> tx_size"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 837c5ff58..ea1a245b4 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -41,6 +41,15 @@ #define DBG_PRNT_SEGMAP 0 + +static const TX_SIZE tx_mode_to_biggest_tx_size[TX_MODES] = { + TX_4X4, // ONLY_4X4 + TX_8X8, // ONLY_8X8 + TX_16X16, // ONLY_16X16 + TX_32X32, // ONLY_32X32 + TX_32X32, // TX_MODE_SELECT +}; + // #define ENC_DEBUG #ifdef ENC_DEBUG int enc_debug = 0; @@ -2622,7 +2631,6 @@ static void adjust_act_zbin(VP9_COMP *cpi, MACROBLOCK *x) { x->act_zbin_adj = 1 - (int) (((int64_t) a + (b >> 1)) / b); #endif } - static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, int mi_row, int mi_col, BLOCK_SIZE bsize) { VP9_COMMON * const cm = &cpi->common; @@ -2730,7 +2738,9 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, update_tx_counts(bsize, context, mbmi->tx_size, &cm->counts.tx); } else { int x, y; - TX_SIZE sz = (cm->tx_mode == TX_MODE_SELECT) ? TX_32X32 : cm->tx_mode; + TX_SIZE sz = tx_mode_to_biggest_tx_size[cm->tx_mode]; + assert(sizeof(tx_mode_to_biggest_tx_size) / + sizeof(tx_mode_to_biggest_tx_size[0]) == TX_MODES); // The new intra coding scheme requires no change of transform size if (is_inter_block(&mi->mbmi)) { if (sz == TX_32X32 && bsize < BLOCK_32X32) |