From 6884a83f06dd6c19ffc16758ecf1a5b0f70ec1a8 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 9 Jan 2013 17:21:28 -0800 Subject: Merge superblocks64 experiment. Change-Id: If6c88752dffdb566f8d4322f135145270716fb8e --- vp9/common/vp9_blockd.h | 2 -- vp9/common/vp9_findnearmv.c | 8 -------- vp9/common/vp9_onyxc_int.h | 2 -- vp9/common/vp9_reconinter.c | 2 -- vp9/common/vp9_reconinter.h | 2 -- vp9/common/vp9_reconintra.c | 6 ------ vp9/common/vp9_rtcd_defs.sh | 4 ---- 7 files changed, 26 deletions(-) (limited to 'vp9/common') diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 26f4a2ff1..5de6d2ecc 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -232,9 +232,7 @@ typedef enum { typedef enum { BLOCK_SIZE_MB16X16 = 0, BLOCK_SIZE_SB32X32 = 1, -#if CONFIG_SUPERBLOCKS64 BLOCK_SIZE_SB64X64 = 2, -#endif } BLOCK_SIZE_TYPE; typedef struct { diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c index b92e7d58b..92e0a0603 100644 --- a/vp9/common/vp9_findnearmv.c +++ b/vp9/common/vp9_findnearmv.c @@ -198,7 +198,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, above_src + 16, xd->dst.y_stride, &sse); score += sse; } -#if CONFIG_SUPERBLOCKS64 if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) { vp9_sub_pixel_variance16x2(above_ref + offset + 32, ref_y_stride, @@ -213,7 +212,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, above_src + 48, xd->dst.y_stride, &sse); score += sse; } -#endif } if (xd->left_available) { vp9_sub_pixel_variance2x16_c(left_ref + offset, ref_y_stride, @@ -230,7 +228,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, xd->dst.y_stride, &sse); score += sse; } -#if CONFIG_SUPERBLOCKS64 if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) { vp9_sub_pixel_variance2x16_c(left_ref + offset + ref_y_stride * 32, ref_y_stride, @@ -247,7 +244,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, xd->dst.y_stride, &sse); score += sse; } -#endif } #else row_offset = (this_mv.as_mv.row > 0) ? @@ -263,14 +259,12 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, score += vp9_sad16x3(above_src + 16, xd->dst.y_stride, above_ref + offset + 16, ref_y_stride); } -#if CONFIG_SUPERBLOCKS64 if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) { score += vp9_sad16x3(above_src + 32, xd->dst.y_stride, above_ref + offset + 32, ref_y_stride); score += vp9_sad16x3(above_src + 48, xd->dst.y_stride, above_ref + offset + 48, ref_y_stride); } -#endif } if (xd->left_available) { score += vp9_sad3x16(left_src, xd->dst.y_stride, @@ -281,7 +275,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, left_ref + offset + ref_y_stride * 16, ref_y_stride); } -#if CONFIG_SUPERBLOCKS64 if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) { score += vp9_sad3x16(left_src + xd->dst.y_stride * 32, xd->dst.y_stride, @@ -292,7 +285,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, left_ref + offset + ref_y_stride * 48, ref_y_stride); } -#endif } #endif // Add the entry to our list and then resort the list on score. diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 440125f91..1dbe7f9f8 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -240,9 +240,7 @@ typedef struct VP9Common { vp9_prob prob_last_coded; vp9_prob prob_gf_coded; vp9_prob sb32_coded; -#if CONFIG_SUPERBLOCKS64 vp9_prob sb64_coded; -#endif // CONFIG_SUPERBLOCKS64 // Context probabilities when using predictive coding of segment id vp9_prob segment_pred_probs[PREDICTION_PROBS]; diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index e6561128c..20de7b7f1 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -614,7 +614,6 @@ void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *x, #endif } -#if CONFIG_SUPERBLOCKS64 void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *x, uint8_t *dst_y, uint8_t *dst_u, @@ -678,7 +677,6 @@ void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *x, } #endif } -#endif // CONFIG_SUPERBLOCKS64 /* * The following functions should be called after an initial diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h index 12b4b2514..89868b95e 100644 --- a/vp9/common/vp9_reconinter.h +++ b/vp9/common/vp9_reconinter.h @@ -54,14 +54,12 @@ extern void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *x, int dst_ystride, int dst_uvstride); -#if CONFIG_SUPERBLOCKS64 extern void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *x, uint8_t *dst_y, uint8_t *dst_u, uint8_t *dst_v, int dst_ystride, int dst_uvstride); -#endif // CONFIG_SUPERBLOCKS64 extern void vp9_build_inter_predictors_mb(MACROBLOCKD *xd); diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c index 0504edaeb..eb99285f4 100644 --- a/vp9/common/vp9_reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -703,7 +703,6 @@ void vp9_build_interintra_32x32_predictors_sb(MACROBLOCKD *xd, vp9_build_interintra_32x32_predictors_sbuv(xd, upred, vpred, uvstride); } -#if CONFIG_SUPERBLOCKS64 void vp9_build_interintra_64x64_predictors_sby(MACROBLOCKD *xd, uint8_t *ypred, int ystride) { @@ -744,7 +743,6 @@ void vp9_build_interintra_64x64_predictors_sb(MACROBLOCKD *xd, vp9_build_interintra_64x64_predictors_sby(xd, ypred, ystride); vp9_build_interintra_64x64_predictors_sbuv(xd, upred, vpred, uvstride); } -#endif // CONFIG_SUPERBLOCKS64 #endif // CONFIG_COMP_INTERINTRA_PRED void vp9_build_intra_predictors_mby(MACROBLOCKD *xd) { @@ -768,14 +766,12 @@ void vp9_build_intra_predictors_sby_s(MACROBLOCKD *xd) { xd->up_available, xd->left_available); } -#if CONFIG_SUPERBLOCKS64 void vp9_build_intra_predictors_sb64y_s(MACROBLOCKD *xd) { vp9_build_intra_predictors_internal(xd->dst.y_buffer, xd->dst.y_stride, xd->dst.y_buffer, xd->dst.y_stride, xd->mode_info_context->mbmi.mode, 64, xd->up_available, xd->left_available); } -#endif // CONFIG_SUPERBLOCKS64 #if CONFIG_COMP_INTRA_PRED void vp9_build_comp_intra_predictors_mby(MACROBLOCKD *xd) { @@ -834,14 +830,12 @@ void vp9_build_intra_predictors_sbuv_s(MACROBLOCKD *xd) { 16); } -#if CONFIG_SUPERBLOCKS64 void vp9_build_intra_predictors_sb64uv_s(MACROBLOCKD *xd) { vp9_build_intra_predictors_mbuv_internal(xd, xd->dst.u_buffer, xd->dst.v_buffer, xd->dst.uv_stride, xd->mode_info_context->mbmi.uv_mode, 32); } -#endif // CONFIG_SUPERBLOCKS64 #if CONFIG_COMP_INTRA_PRED void vp9_build_comp_intra_predictors_mbuv(MACROBLOCKD *xd) { diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index 329c0929e..9d1f51568 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -172,16 +172,12 @@ specialize vp9_build_intra_predictors_mbuv_s; prototype void vp9_build_comp_intra_predictors_mbuv "struct macroblockd *x" specialize vp9_build_comp_intra_predictors_mbuv; -if [ "$CONFIG_SUPERBLOCKS64" = "yes" ]; then - prototype void vp9_build_intra_predictors_sb64y_s "struct macroblockd *x" specialize vp9_build_intra_predictors_sb64y_s; prototype void vp9_build_intra_predictors_sb64uv_s "struct macroblockd *x" specialize vp9_build_intra_predictors_sb64uv_s; -fi - prototype void vp9_intra4x4_predict "struct blockd *x, int b_mode, uint8_t *predictor" specialize vp9_intra4x4_predict; -- cgit v1.2.3