diff options
| author | Jingning Han <jingning@google.com> | 2013-04-24 15:10:23 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2013-04-24 15:19:17 -0700 |
| commit | b0e3b3df18ade11bd780642a11933df8e09514e9 (patch) | |
| tree | b7567e9d3f14fa5da26b8e73827dfa3e92241d51 /vp9/common/vp9_blockd.c | |
| parent | ff2b8aa2c9f95a8456306d2a9ce28803eb90b38a (diff) | |
| download | libvpx-b0e3b3df18ade11bd780642a11933df8e09514e9.tar libvpx-b0e3b3df18ade11bd780642a11933df8e09514e9.tar.gz libvpx-b0e3b3df18ade11bd780642a11933df8e09514e9.tar.bz2 libvpx-b0e3b3df18ade11bd780642a11933df8e09514e9.zip | |
Move sbsegment out of experimental list
Move rectangular superblock coding out of experimental list.
Change-Id: I96c37547d122330d666a67b4bf577ae54547857f
Diffstat (limited to 'vp9/common/vp9_blockd.c')
| -rw-r--r-- | vp9/common/vp9_blockd.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c index 6a68f6ee2..d06e1b2f5 100644 --- a/vp9/common/vp9_blockd.c +++ b/vp9/common/vp9_blockd.c @@ -60,7 +60,6 @@ const uint8_t vp9_block2above[TX_SIZE_MAX_MB][24] = { #define S(x) x + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT) -#if CONFIG_SBSEGMENT const uint8_t vp9_block2left_sb16x32[TX_SIZE_MAX_MB][48] = { { 0, 0, 0, 0, 1, 1, 1, 1, @@ -190,7 +189,6 @@ const uint8_t vp9_block2above_sb32x16[TX_SIZE_MAX_MB][48] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; -#endif const uint8_t vp9_block2left_sb[TX_SIZE_MAX_SB][96] = { { 0, 0, 0, 0, 0, 0, 0, 0, @@ -312,7 +310,6 @@ const uint8_t vp9_block2above_sb[TX_SIZE_MAX_SB][96] = { #define T(x) x + 2 * (sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT)) #define U(x) x + 3 * (sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT)) -#if CONFIG_SBSEGMENT const uint8_t vp9_block2left_sb32x64[TX_SIZE_MAX_SB][192] = { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, @@ -656,7 +653,6 @@ const uint8_t vp9_block2above_sb64x32[TX_SIZE_MAX_SB][192] = { T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0), T(0) }, }; -#endif const uint8_t vp9_block2left_sb64[TX_SIZE_MAX_SB][384] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |