diff options
Diffstat (limited to 'vp8/common')
-rw-r--r-- | vp8/common/blockd.h | 2 | ||||
-rw-r--r-- | vp8/common/filter.c | 16 | ||||
-rw-r--r-- | vp8/common/generic/systemdependent.c | 3 | ||||
-rw-r--r-- | vp8/common/reconinter.c | 2 | ||||
-rw-r--r-- | vp8/common/subpixel.h | 4 | ||||
-rw-r--r-- | vp8/common/x86/x86_systemdependent.c | 12 |
6 files changed, 13 insertions, 26 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 1bbaa6422..ccd1d468d 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -80,13 +80,11 @@ typedef enum { SIXTAP = 0, BILINEAR = 1, -#if CONFIG_ENHANCED_INTERP EIGHTTAP = 2, EIGHTTAP_SHARP = 3, #if CONFIG_SWITCHABLE_INTERP SWITCHABLE /* should be the last one */ #endif -#endif } INTERPOLATIONFILTERTYPE; #if 0//CONFIG_SWITCHABLE_INTERP diff --git a/vp8/common/filter.c b/vp8/common/filter.c index 78c239080..1a582348d 100644 --- a/vp8/common/filter.c +++ b/vp8/common/filter.c @@ -43,11 +43,10 @@ DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[SUBPEL_SHIFTS][2]) = { #endif /* SUBPEL_SHIFTS==16 */ }; -#if CONFIG_ENHANCED_INTERP - #define FILTER_ALPHA 0 #define FILTER_ALPHA_SHARP 1 -DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8[SUBPEL_SHIFTS][2 * INTERP_EXTEND]) = { +DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8[SUBPEL_SHIFTS][8]) = { + #if SUBPEL_SHIFTS==16 #if FILTER_ALPHA == 0 /* Lagrangian interpolation filter */ @@ -116,7 +115,7 @@ DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8[SUBPEL_SHIFTS][2 * INTERP #endif /* SUBPEL_SHIFTS==16 */ }; -DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8s[SUBPEL_SHIFTS][2 * INTERP_EXTEND]) = { +DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8s[SUBPEL_SHIFTS][8]) = { #if SUBPEL_SHIFTS==16 #if FILTER_ALPHA_SHARP == 1 /* dct based filter */ @@ -137,6 +136,7 @@ DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8s[SUBPEL_SHIFTS][2 * INTER {-1, 3, -6, 17, 125, -13, 5, -2}, {0, 1, -3, 8, 127, -7, 3, -1} #elif FILTER_ALPHA_SHARP == 75 + /* alpha = 0.75 */ {0, 0, 0, 128, 0, 0, 0, 0}, {-1, 2, -6, 126, 9, -3, 2, -1}, {-1, 4, -11, 123, 18, -7, 3, -1}, @@ -174,6 +174,7 @@ DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8s[SUBPEL_SHIFTS][2 * INTER #endif /* FILTER_ALPHA_SHARP */ #else /* SUBPEL_SHIFTS==16 */ #if FILTER_ALPHA_SHARP == 1 + /* dct based filter */ {0, 0, 0, 128, 0, 0, 0, 0}, {-2, 5, -13, 125, 17, -6, 3, -1}, {-4, 9, -20, 115, 37, -13, 6, -2}, @@ -183,6 +184,7 @@ DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8s[SUBPEL_SHIFTS][2 * INTER {-2, 6, -13, 37, 115, -20, 9, -4}, {-1, 3, -6, 17, 125, -13, 5, -2} #elif FILTER_ALPHA_SHARP == 75 + /* alpha = 0.75 */ {0, 0, 0, 128, 0, 0, 0, 0}, {-1, 4, -11, 123, 18, -7, 3, -1}, {-2, 7, -19, 113, 38, -13, 6, -2}, @@ -205,8 +207,6 @@ DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_8s[SUBPEL_SHIFTS][2 * INTER #endif /* SUBPEL_SHIFTS==16 */ }; -#endif // CONFIG_ENHANCED_INTERP - DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters_6[SUBPEL_SHIFTS][6]) = { #if SUBPEL_SHIFTS==16 {0, 0, 128, 0, 0, 0}, @@ -590,8 +590,6 @@ void vp8_sixtap_predict_avg16x16_c 16, 16, 16, 16, VFilter); } -#if CONFIG_ENHANCED_INTERP - #undef Interp_Extend #define Interp_Extend 4 @@ -1148,8 +1146,6 @@ void vp8_eighttap_predict_avg16x16_sharp_c 16, 16, 16, 16, VFilter); } -#endif /* CONFIG_ENHANCED_INTERP */ - /**************************************************************************** * * ROUTINE : filter_block2d_bil_first_pass diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index df162234c..441426320 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -78,7 +78,6 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) { vp8_comp_intra_uv4x4_predict; #endif -#if CONFIG_ENHANCED_INTERP rtcd->subpix.eighttap16x16 = vp8_eighttap_predict16x16_c; rtcd->subpix.eighttap8x8 = vp8_eighttap_predict8x8_c; rtcd->subpix.eighttap_avg16x16 = vp8_eighttap_predict_avg16x16_c; @@ -93,7 +92,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) { rtcd->subpix.eighttap_avg4x4_sharp = vp8_eighttap_predict_avg4x4_sharp_c; rtcd->subpix.eighttap8x4_sharp = vp8_eighttap_predict8x4_sharp_c; rtcd->subpix.eighttap4x4_sharp = vp8_eighttap_predict_sharp_c; -#endif + rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c; rtcd->subpix.sixtap_avg16x16 = vp8_sixtap_predict_avg16x16_c; diff --git a/vp8/common/reconinter.c b/vp8/common/reconinter.c index 6f7d963c6..4a828cda0 100644 --- a/vp8/common/reconinter.c +++ b/vp8/common/reconinter.c @@ -38,7 +38,6 @@ void vp8_setup_interp_filters(MACROBLOCKD *xd, xd->subpixel_predict_avg16x16 = SUBPIX_INVOKE( &cm->rtcd.subpix, sixtap_avg16x16); } -#if CONFIG_ENHANCED_INTERP else if (mcomp_filter_type == EIGHTTAP #if CONFIG_SWITCHABLE_INTERP || @@ -75,7 +74,6 @@ void vp8_setup_interp_filters(MACROBLOCKD *xd, xd->subpixel_predict_avg16x16 = SUBPIX_INVOKE( &cm->rtcd.subpix, eighttap_avg16x16_sharp); } -#endif else { xd->subpixel_predict = SUBPIX_INVOKE( &cm->rtcd.subpix, bilinear4x4); diff --git a/vp8/common/subpixel.h b/vp8/common/subpixel.h index c2dae7275..3b5b6675c 100644 --- a/vp8/common/subpixel.h +++ b/vp8/common/subpixel.h @@ -58,7 +58,6 @@ extern prototype_subpixel_predict(vp8_subpix_sixtap4x4); #endif extern prototype_subpixel_predict(vp8_subpix_sixtap_avg4x4); -#if CONFIG_ENHANCED_INTERP #ifndef vp8_subpix_eighttap16x16 #define vp8_subpix_eighttap16x16 vp8_eighttap_predict16x16_c #endif @@ -128,7 +127,6 @@ extern prototype_subpixel_predict(vp8_subpix_eighttap4x4_sharp); #define vp8_subpix_eighttap_avg4x4_sharp vp8_eighttap_predict_avg4x4_sharp_c #endif extern prototype_subpixel_predict(vp8_subpix_eighttap_avg4x4_sharp); -#endif /* CONFIG_ENAHNCED_INTERP */ #ifndef vp8_subpix_bilinear16x16 #define vp8_subpix_bilinear16x16 vp8_bilinear_predict16x16_c @@ -167,7 +165,6 @@ extern prototype_subpixel_predict(vp8_subpix_bilinear_avg4x4); typedef prototype_subpixel_predict((*vp8_subpix_fn_t)); typedef struct { -#if CONFIG_ENHANCED_INTERP vp8_subpix_fn_t eighttap16x16; vp8_subpix_fn_t eighttap8x8; vp8_subpix_fn_t eighttap_avg16x16; @@ -182,7 +179,6 @@ typedef struct { vp8_subpix_fn_t eighttap_avg4x4_sharp; vp8_subpix_fn_t eighttap8x4_sharp; vp8_subpix_fn_t eighttap4x4_sharp; -#endif vp8_subpix_fn_t sixtap16x16; vp8_subpix_fn_t sixtap8x8; vp8_subpix_fn_t sixtap_avg16x16; diff --git a/vp8/common/x86/x86_systemdependent.c b/vp8/common/x86/x86_systemdependent.c index d60442f67..2c66d9fb7 100644 --- a/vp8/common/x86/x86_systemdependent.c +++ b/vp8/common/x86/x86_systemdependent.c @@ -46,12 +46,12 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx) { rtcd->recon.copy8x4 = vp8_copy_mem8x4_mmx; rtcd->recon.copy16x16 = vp8_copy_mem16x16_mmx; -#if CONFIG_ENHANCED_INTERP == 0 && CONFIG_HIGH_PRECISION_MV == 0 && CONFIG_SIXTEENTH_SUBPEL_UV == 0 + /* Disabled due to unsupported enhanced interpolation/high_prec mv rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_mmx; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_mmx; rtcd->subpix.sixtap8x4 = vp8_sixtap_predict8x4_mmx; rtcd->subpix.sixtap4x4 = vp8_sixtap_predict4x4_mmx; -#endif + */ rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_mmx; rtcd->subpix.bilinear8x8 = vp8_bilinear_predict8x8_mmx; rtcd->subpix.bilinear8x4 = vp8_bilinear_predict8x4_mmx; @@ -91,11 +91,11 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx) { // rtcd->idct.iwalsh16 = vp8_short_inv_walsh4x4_sse2; -#if CONFIG_ENHANCED_INTERP == 0 && CONFIG_HIGH_PRECISION_MV == 0 && CONFIG_SIXTEENTH_SUBPEL_UV == 0 + /* Disabled due to unsupported enhanced interpolation/high_prec mv rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_sse2; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_sse2; rtcd->subpix.sixtap8x4 = vp8_sixtap_predict8x4_sse2; -#endif + */ rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_sse2; rtcd->subpix.bilinear8x8 = vp8_bilinear_predict8x8_sse2; @@ -121,14 +121,14 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx) { #if HAVE_SSSE3 if (flags & HAS_SSSE3) { -#if CONFIG_ENHANCED_INTERP == 0 && CONFIG_HIGH_PRECISION_MV == 0 && CONFIG_SIXTEENTH_SUBPEL_UV == 0 + /* Disabled due to unsupported enhanced interpolation/high_prec mv rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_ssse3; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_ssse3; rtcd->subpix.sixtap8x4 = vp8_sixtap_predict8x4_ssse3; rtcd->subpix.sixtap4x4 = vp8_sixtap_predict4x4_ssse3; rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_ssse3; rtcd->subpix.bilinear8x8 = vp8_bilinear_predict8x8_ssse3; -#endif + */ /* these are disable because of unsupported diagonal pred modes rtcd->recon.build_intra_predictors_mbuv = |