Remove enable_6tap filter experiment.
Clean out code under CONFIG_ENABLE_6TAP flag. Change-Id: Ic45b624081181027d6ba24d55dd644c3197f9830
This commit is contained in:
parent
8c1b516d10
commit
0bfcd30768
1
configure
vendored
1
configure
vendored
@ -241,7 +241,6 @@ EXPERIMENT_LIST="
|
||||
csm
|
||||
implicit_segmentation
|
||||
comp_interintra_pred
|
||||
enable_6tap
|
||||
modelcoefprob
|
||||
loop_dering
|
||||
scatterscan
|
||||
|
@ -62,9 +62,6 @@ typedef enum {
|
||||
} FRAME_TYPE;
|
||||
|
||||
typedef enum {
|
||||
#if CONFIG_ENABLE_6TAP
|
||||
SIXTAP,
|
||||
#endif
|
||||
EIGHTTAP_SMOOTH,
|
||||
EIGHTTAP,
|
||||
EIGHTTAP_SHARP,
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user