diff options
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 3 | ||||
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 14 | ||||
| -rw-r--r-- | vp9/common/vp9_reconinter.c | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 6 |
4 files changed, 1 insertions, 27 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index b18a4aa09..a21993598 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -62,9 +62,6 @@ typedef enum { } FRAME_TYPE; typedef enum { -#if CONFIG_ENABLE_6TAP - SIXTAP, -#endif EIGHTTAP_SMOOTH, EIGHTTAP, EIGHTTAP_SHARP, diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index f3fead6ee..503ad9598 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -304,15 +304,9 @@ const vp9_tree_index vp9_switchable_interp_tree[VP9_SWITCHABLE_FILTERS*2-2] = { -1, -2 }; struct vp9_token vp9_switchable_interp_encodings[VP9_SWITCHABLE_FILTERS]; -#if CONFIG_ENABLE_6TAP -const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = { - SIXTAP, EIGHTTAP, EIGHTTAP_SHARP}; -const int vp9_switchable_interp_map[SWITCHABLE+1] = {0, -1, 1, 2, -1, -1}; -#else const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = { EIGHTTAP, EIGHTTAP_SMOOTH, EIGHTTAP_SHARP}; const int vp9_switchable_interp_map[SWITCHABLE+1] = {1, 0, 2, -1, -1}; -#endif const vp9_prob vp9_switchable_interp_prob [VP9_SWITCHABLE_FILTERS+1] [VP9_SWITCHABLE_FILTERS-1] = { {248, 192}, { 32, 248}, { 32, 32}, {192, 160} @@ -330,20 +324,12 @@ const vp9_prob vp9_switchable_interp_prob [VP9_SWITCHABLE_FILTERS+1] }; const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = { EIGHTTAP, EIGHTTAP_SHARP}; -#if CONFIG_ENABLE_6TAP -const int vp9_switchable_interp_map[SWITCHABLE+1] = {-1, -1, 0, 1, -1, -1}; -#else const int vp9_switchable_interp_map[SWITCHABLE+1] = {-1, 0, 1, -1, -1}; -#endif #endif // VP9_SWITCHABLE_FILTERS // Indicates if the filter is interpolating or non-interpolating // Note currently only the EIGHTTAP_SMOOTH is non-interpolating -#if CONFIG_ENABLE_6TAP -const int vp9_is_interpolating_filter[SWITCHABLE + 1] = {1, 0, 1, 1, 1, -1}; -#else const int vp9_is_interpolating_filter[SWITCHABLE + 1] = {0, 1, 1, 1, -1}; -#endif void vp9_entropy_mode_init() { vp9_tokens_from_tree(vp9_kf_bmode_encodings, vp9_kf_bmode_tree); diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index e39e050c2..14642f20c 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -125,11 +125,6 @@ void vp9_setup_interp_filters(MACROBLOCKD *xd, case BILINEAR: xd->subpix.filter_x = xd->subpix.filter_y = vp9_bilinear_filters; break; -#if CONFIG_ENABLE_6TAP - case SIXTAP: - xd->subpix.filter_x = xd->subpix.filter_y = vp9_sub_pel_filters_6; - break; -#endif } assert(((intptr_t)xd->subpix.filter_x & 0xff) == 0); } diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index a47758bb7..09a0fab0f 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -2624,11 +2624,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, /* list of filters to search over */ int mcomp_filters_to_search[] = { -#if CONFIG_ENABLE_6TAP - EIGHTTAP, EIGHTTAP_SHARP, SIXTAP, SWITCHABLE -#else - EIGHTTAP, EIGHTTAP_SHARP, EIGHTTAP_SMOOTH, SWITCHABLE -#endif + EIGHTTAP, EIGHTTAP_SHARP, EIGHTTAP_SMOOTH, SWITCHABLE }; int mcomp_filters = sizeof(mcomp_filters_to_search) / sizeof(*mcomp_filters_to_search); |