generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove enable_6tap filter experiment.

Browse Source 
Clean out code under CONFIG_ENABLE_6TAP flag.

Change-Id: Ic45b624081181027d6ba24d55dd644c3197f9830
This commit is contained in:
Paul Wilkins 2013-05-07 16:19:25 +01:00 committed by Gerrit Code Review
parent 8c1b516d10
commit 0bfcd30768
5 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -241,7 +241,6 @@ EXPERIMENT_LIST="
csm csm
implicit_segmentation implicit_segmentation
comp_interintra_pred comp_interintra_pred
enable_6tap
modelcoefprob modelcoefprob
loop_dering loop_dering
scatterscan scatterscan

3
vp9/common/vp9_blockd.h
View File

@ -62,9 +62,6 @@ typedef enum {
} FRAME_TYPE; } FRAME_TYPE;
typedef enum { typedef enum {
#if CONFIG_ENABLE_6TAP
SIXTAP,
#endif
EIGHTTAP_SMOOTH, EIGHTTAP_SMOOTH,
EIGHTTAP, EIGHTTAP,
EIGHTTAP_SHARP, EIGHTTAP_SHARP,

14
vp9/common/vp9_entropymode.c
View File

@ -304,15 +304,9 @@ const vp9_tree_index vp9_switchable_interp_tree[VP9_SWITCHABLE_FILTERS*2-2] = {
-1, -2 -1, -2
}; };
struct vp9_token vp9_switchable_interp_encodings[VP9_SWITCHABLE_FILTERS]; 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] = { const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = {
EIGHTTAP, EIGHTTAP_SMOOTH, EIGHTTAP_SHARP}; EIGHTTAP, EIGHTTAP_SMOOTH, EIGHTTAP_SHARP};
const int vp9_switchable_interp_map[SWITCHABLE+1] = {1, 0, 2, -1, -1}; 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] const vp9_prob vp9_switchable_interp_prob [VP9_SWITCHABLE_FILTERS+1]
[VP9_SWITCHABLE_FILTERS-1] = { [VP9_SWITCHABLE_FILTERS-1] = {
{248, 192}, { 32, 248}, { 32, 32}, {192, 160} {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] = { const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = {
EIGHTTAP, EIGHTTAP_SHARP}; 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}; const int vp9_switchable_interp_map[SWITCHABLE+1] = {-1, 0, 1, -1, -1};
#endif
#endif // VP9_SWITCHABLE_FILTERS #endif // VP9_SWITCHABLE_FILTERS
// Indicates if the filter is interpolating or non-interpolating // Indicates if the filter is interpolating or non-interpolating
// Note currently only the EIGHTTAP_SMOOTH is 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}; const int vp9_is_interpolating_filter[SWITCHABLE + 1] = {0, 1, 1, 1, -1};
#endif
void vp9_entropy_mode_init() { void vp9_entropy_mode_init() {
vp9_tokens_from_tree(vp9_kf_bmode_encodings, vp9_kf_bmode_tree); vp9_tokens_from_tree(vp9_kf_bmode_encodings, vp9_kf_bmode_tree);

5
vp9/common/vp9_reconinter.c
View File

@ -125,11 +125,6 @@ void vp9_setup_interp_filters(MACROBLOCKD *xd,
case BILINEAR: case BILINEAR:
xd->subpix.filter_x = xd->subpix.filter_y = vp9_bilinear_filters; xd->subpix.filter_x = xd->subpix.filter_y = vp9_bilinear_filters;
break; 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); assert(((intptr_t)xd->subpix.filter_x & 0xff) == 0);
} }

6
vp9/encoder/vp9_onyx_if.c
View File

@ -2624,11 +2624,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
/* list of filters to search over */ /* list of filters to search over */
int mcomp_filters_to_search[] = { int mcomp_filters_to_search[] = {
#if CONFIG_ENABLE_6TAP EIGHTTAP, EIGHTTAP_SHARP, EIGHTTAP_SMOOTH, SWITCHABLE
EIGHTTAP, EIGHTTAP_SHARP, SIXTAP, SWITCHABLE
#else
EIGHTTAP, EIGHTTAP_SHARP, EIGHTTAP_SMOOTH, SWITCHABLE
#endif
}; };
int mcomp_filters = sizeof(mcomp_filters_to_search) / int mcomp_filters = sizeof(mcomp_filters_to_search) /
sizeof(*mcomp_filters_to_search); sizeof(*mcomp_filters_to_search);