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 | |
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')
-rw-r--r-- | vp9/common/vp9_blockd.c | 4 | ||||
-rw-r--r-- | vp9/common/vp9_blockd.h | 26 | ||||
-rw-r--r-- | vp9/common/vp9_entropymode.c | 14 | ||||
-rw-r--r-- | vp9/common/vp9_enums.h | 8 | ||||
-rw-r--r-- | vp9/common/vp9_reconintra.c | 4 | ||||
-rw-r--r-- | vp9/common/vp9_rtcd_defs.sh | 16 |
6 files changed, 4 insertions, 68 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, diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 1e55bed9b..c6cf6c05b 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -202,18 +202,12 @@ typedef enum { static INLINE int mb_width_log2(BLOCK_SIZE_TYPE sb_type) { switch (sb_type) { -#if CONFIG_SBSEGMENT - case BLOCK_SIZE_SB16X32: -#endif - case BLOCK_SIZE_MB16X16: return 0; -#if CONFIG_SBSEGMENT + case BLOCK_SIZE_MB16X16: + case BLOCK_SIZE_SB16X32: return 0; case BLOCK_SIZE_SB32X16: case BLOCK_SIZE_SB32X64: -#endif case BLOCK_SIZE_SB32X32: return 1; -#if CONFIG_SBSEGMENT case BLOCK_SIZE_SB64X32: -#endif case BLOCK_SIZE_SB64X64: return 2; default: assert(0); } @@ -221,18 +215,12 @@ static INLINE int mb_width_log2(BLOCK_SIZE_TYPE sb_type) { static INLINE int mb_height_log2(BLOCK_SIZE_TYPE sb_type) { switch (sb_type) { -#if CONFIG_SBSEGMENT - case BLOCK_SIZE_SB32X16: -#endif - case BLOCK_SIZE_MB16X16: return 0; -#if CONFIG_SBSEGMENT + case BLOCK_SIZE_MB16X16: + case BLOCK_SIZE_SB32X16: return 0; case BLOCK_SIZE_SB16X32: case BLOCK_SIZE_SB64X32: -#endif case BLOCK_SIZE_SB32X32: return 1; -#if CONFIG_SBSEGMENT case BLOCK_SIZE_SB32X64: -#endif case BLOCK_SIZE_SB64X64: return 2; default: assert(0); } @@ -470,7 +458,6 @@ static INLINE void update_partition_context(MACROBLOCKD *xd, xd->left_seg_context[i] = ~(0xf << boffset); for (i = 0; i < bs; i++) xd->above_seg_context[i] = ~(0xf << boffset); -#if CONFIG_SBSEGMENT } else if ((bwl == bsl) && (bhl < bsl)) { for (i = 0; i < bs; i++) xd->left_seg_context[i] = ~(0xe << boffset); @@ -481,7 +468,6 @@ static INLINE void update_partition_context(MACROBLOCKD *xd, xd->left_seg_context[i] = ~(0xf << boffset); for (i = 0; i < bs; i++) xd->above_seg_context[i] = ~(0xe << boffset); -#endif } else if ((bwl < bsl) && (bhl < bsl)) { for (i = 0; i < bs; i++) xd->left_seg_context[i] = ~(0xe << boffset); @@ -571,7 +557,6 @@ extern const uint8_t vp9_block2left_sb[TX_SIZE_MAX_SB][96]; extern const uint8_t vp9_block2above_sb[TX_SIZE_MAX_SB][96]; extern const uint8_t vp9_block2left_sb64[TX_SIZE_MAX_SB][384]; extern const uint8_t vp9_block2above_sb64[TX_SIZE_MAX_SB][384]; -#if CONFIG_SBSEGMENT extern const uint8_t vp9_block2left_sb16x32[TX_SIZE_MAX_MB][48]; extern const uint8_t vp9_block2above_sb16x32[TX_SIZE_MAX_MB][48]; extern const uint8_t vp9_block2left_sb32x16[TX_SIZE_MAX_MB][48]; @@ -580,7 +565,6 @@ extern const uint8_t vp9_block2left_sb32x64[TX_SIZE_MAX_SB][192]; extern const uint8_t vp9_block2above_sb32x64[TX_SIZE_MAX_SB][192]; extern const uint8_t vp9_block2left_sb64x32[TX_SIZE_MAX_SB][192]; extern const uint8_t vp9_block2above_sb64x32[TX_SIZE_MAX_SB][192]; -#endif #define USE_ADST_FOR_I16X16_8X8 1 #define USE_ADST_FOR_I16X16_4X4 1 @@ -786,10 +770,8 @@ static TX_SIZE get_uv_tx_size(const MACROBLOCKD *xd) { switch (mbmi->sb_type) { case BLOCK_SIZE_SB64X64: return size; -#if CONFIG_SBSEGMENT case BLOCK_SIZE_SB64X32: case BLOCK_SIZE_SB32X64: -#endif case BLOCK_SIZE_SB32X32: if (size == TX_32X32) return TX_16X16; diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index fc93c9961..626c7d4cf 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -151,7 +151,6 @@ const int vp9_mbsplit_count [VP9_NUMMBSPLITS] = { 2, 2, 4, 16}; const vp9_prob vp9_mbsplit_probs [VP9_NUMMBSPLITS - 1] = { 110, 111, 150}; -#if CONFIG_SBSEGMENT const vp9_prob vp9_partition_probs[NUM_PARTITION_CONTEXTS] [PARTITION_TYPES - 1] = { {202, 162, 107}, @@ -163,13 +162,6 @@ const vp9_prob vp9_partition_probs[NUM_PARTITION_CONTEXTS] {67, 208, 22}, {4, 17, 5}, }; -#else -const vp9_prob vp9_partition_probs[NUM_PARTITION_CONTEXTS] - [PARTITION_TYPES - 1] = { - {200}, {200}, {200}, {200}, - {200}, {200}, {200}, {200}, -}; -#endif /* Array indices are identical to previously-existing INTRAMODECONTEXTNODES. */ @@ -303,17 +295,11 @@ const vp9_tree_index vp9_sub_mv_ref_tree[6] = { -ZERO4X4, -NEW4X4 }; -#if CONFIG_SBSEGMENT const vp9_tree_index vp9_partition_tree[6] = { -PARTITION_NONE, 2, -PARTITION_HORZ, 4, -PARTITION_VERT, -PARTITION_SPLIT }; -#else -const vp9_tree_index vp9_partition_tree[2] = { - -PARTITION_NONE, -PARTITION_SPLIT -}; -#endif struct vp9_token vp9_bmode_encodings[VP9_NKF_BINTRAMODES]; struct vp9_token vp9_kf_bmode_encodings[VP9_KF_BINTRAMODES]; diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h index d9a6721a7..23ed3e145 100644 --- a/vp9/common/vp9_enums.h +++ b/vp9/common/vp9_enums.h @@ -16,30 +16,22 @@ typedef enum BLOCK_SIZE_TYPE { #if CONFIG_SB8X8 BLOCK_SIZE_SB8X8, -#if CONFIG_SBSEGMENT BLOCK_SIZE_SB8X16, BLOCK_SIZE_SB16X8, #endif -#endif BLOCK_SIZE_MB16X16, -#if CONFIG_SBSEGMENT BLOCK_SIZE_SB16X32, BLOCK_SIZE_SB32X16, -#endif BLOCK_SIZE_SB32X32, -#if CONFIG_SBSEGMENT BLOCK_SIZE_SB32X64, BLOCK_SIZE_SB64X32, -#endif BLOCK_SIZE_SB64X64, } BLOCK_SIZE_TYPE; typedef enum PARTITION_TYPE { PARTITION_NONE, -#if CONFIG_SBSEGMENT PARTITION_HORZ, PARTITION_VERT, -#endif PARTITION_SPLIT, PARTITION_TYPES } PARTITION_TYPE; diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c index 4e786b0f8..23fc55205 100644 --- a/vp9/common/vp9_reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -310,7 +310,6 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, ypred_ptr += y_stride; } break; -#if CONFIG_SBSEGMENT case D45_PRED: case D135_PRED: case D117_PRED: @@ -319,7 +318,6 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, case D63_PRED: if (bw == bh) { switch (mode) { -#endif case D45_PRED: d45_predictor(ypred_ptr, y_stride, bw, bh, yabove_row, yleft_col); break; @@ -338,7 +336,6 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, case D63_PRED: d63_predictor(ypred_ptr, y_stride, bw, bh, yabove_row, yleft_col); break; -#if CONFIG_SBSEGMENT default: assert(0); } @@ -398,7 +395,6 @@ void vp9_build_intra_predictors(uint8_t *src, int src_stride, memcpy(ypred_ptr + y_stride * i, pred + i * 64, bw); } break; -#endif default: break; } diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index 61a2de45f..40fe41c20 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -306,8 +306,6 @@ if [ "$CONFIG_VP9_ENCODER" = "yes" ]; then # variance [ $arch = "x86_64" ] && mmx_x86_64=mmx && sse2_x86_64=sse2 -if [ "$CONFIG_SBSEGMENT" = "yes" ]; then - prototype unsigned int vp9_variance32x16 "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse" specialize vp9_variance32x16 @@ -320,8 +318,6 @@ specialize vp9_variance64x32 prototype unsigned int vp9_variance32x64 "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse" specialize vp9_variance32x64 -fi - prototype unsigned int vp9_variance32x32 "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse" specialize vp9_variance32x32 @@ -356,8 +352,6 @@ vp9_variance4x4_mmx=vp9_variance4x4_mmx prototype unsigned int vp9_sub_pixel_variance64x64 "const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse" specialize vp9_sub_pixel_variance64x64 sse2 -if [ "$CONFIG_SBSEGMENT" = "yes" ]; then - prototype unsigned int vp9_sub_pixel_variance32x64 "const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse" specialize vp9_sub_pixel_variance32x64 @@ -370,8 +364,6 @@ specialize vp9_sub_pixel_variance32x16 prototype unsigned int vp9_sub_pixel_variance16x32 "const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse" specialize vp9_sub_pixel_variance16x32 -fi - prototype unsigned int vp9_sub_pixel_variance32x32 "const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse" specialize vp9_sub_pixel_variance32x32 sse2 @@ -398,8 +390,6 @@ vp9_sub_pixel_variance4x4_sse2=vp9_sub_pixel_variance4x4_wmt prototype unsigned int vp9_sad64x64 "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad" specialize vp9_sad64x64 sse2 -if [ "$CONFIG_SBSEGMENT" = "yes" ]; then - prototype unsigned int vp9_sad32x64 "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad" specialize vp9_sad32x64 sse2 @@ -412,8 +402,6 @@ specialize vp9_sad32x16 sse2 prototype unsigned int vp9_sad16x32 "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad" specialize vp9_sad16x32 sse2 -fi - prototype unsigned int vp9_sad32x32 "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad" specialize vp9_sad32x32 sse2 @@ -507,8 +495,6 @@ specialize vp9_sad4x4x8 sse4 prototype void vp9_sad64x64x4d "const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array" specialize vp9_sad64x64x4d sse2 -if [ "$CONFIG_SBSEGMENT" = "yes" ]; then - prototype void vp9_sad32x64x4d "const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array" specialize vp9_sad32x64x4d sse2 @@ -521,8 +507,6 @@ specialize vp9_sad32x16x4d sse2 prototype void vp9_sad16x32x4d "const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array" specialize vp9_sad16x32x4d sse2 -fi - prototype void vp9_sad32x32x4d "const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array" specialize vp9_sad32x32x4d sse2 |