diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-22 12:18:46 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-22 12:18:46 -0700 |
| commit | 7906ed091ab5d16a7fbdc21109a034644aa6b9a3 (patch) | |
| tree | f8fc3e6687ce6f5e6532778df19ca7f0b14fc7d2 /vp8/common/default_coef_probs.h | |
| parent | 372e001d68c3a6c58613d8418933047e868a1e98 (diff) | |
| parent | f10465634bbbdc2cd251d8e12d965b91b6cecb83 (diff) | |
| download | libvpx-7906ed091ab5d16a7fbdc21109a034644aa6b9a3.tar libvpx-7906ed091ab5d16a7fbdc21109a034644aa6b9a3.tar.gz libvpx-7906ed091ab5d16a7fbdc21109a034644aa6b9a3.tar.bz2 libvpx-7906ed091ab5d16a7fbdc21109a034644aa6b9a3.zip | |
Merge "Merging the hybrid transform experiments" into experimental
Diffstat (limited to 'vp8/common/default_coef_probs.h')
| -rw-r--r-- | vp8/common/default_coef_probs.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/vp8/common/default_coef_probs.h b/vp8/common/default_coef_probs.h index 5e21195ee..bd1f795d0 100644 --- a/vp8/common/default_coef_probs.h +++ b/vp8/common/default_coef_probs.h @@ -13,9 +13,9 @@ static const vp8_prob default_coef_probs [BLOCK_TYPES] -[COEF_BANDS] -[PREV_COEF_CONTEXTS] -[ENTROPY_NODES] = { + [COEF_BANDS] + [PREV_COEF_CONTEXTS] + [ENTROPY_NODES] = { { /* Block Type ( 0 ) */ { @@ -254,11 +254,10 @@ static const vp8_prob default_coef_probs [BLOCK_TYPES] } }; -#if CONFIG_HYBRIDTRANSFORM static const vp8_prob default_hybrid_coef_probs [BLOCK_TYPES] -[COEF_BANDS] -[PREV_COEF_CONTEXTS] -[ENTROPY_NODES] = { + [COEF_BANDS] + [PREV_COEF_CONTEXTS] + [ENTROPY_NODES] = { { /* Block Type ( 0 ) */ { @@ -496,7 +495,6 @@ static const vp8_prob default_hybrid_coef_probs [BLOCK_TYPES] } } }; -#endif static const vp8_prob default_coef_probs_8x8[BLOCK_TYPES_8X8] @@ -731,12 +729,11 @@ default_coef_probs_8x8[BLOCK_TYPES_8X8] } }; -#if CONFIG_HYBRIDTRANSFORM8X8 static const vp8_prob default_hybrid_coef_probs_8x8[BLOCK_TYPES_8X8] - [COEF_BANDS] - [PREV_COEF_CONTEXTS] - [ENTROPY_NODES] = { + [COEF_BANDS] + [PREV_COEF_CONTEXTS] + [ENTROPY_NODES] = { { /* block Type 0 */ { @@ -964,7 +961,6 @@ default_hybrid_coef_probs_8x8[BLOCK_TYPES_8X8] } } }; -#endif static const vp8_prob default_coef_probs_16x16[BLOCK_TYPES_16X16] @@ -1173,7 +1169,6 @@ static const vp8_prob } }; -#if CONFIG_HYBRIDTRANSFORM16X16 static const vp8_prob default_hybrid_coef_probs_16x16[BLOCK_TYPES_16X16] [COEF_BANDS] @@ -1380,4 +1375,3 @@ static const vp8_prob } } }; -#endif |