Commit 8b084b68 authored by Jingning Han's avatar Jingning Han

Clean up ext-interp experiment

Remove the unused sub-experiments within the ext-interp experiment.

Change-Id: I716e3392412d02c56f9395a86c9cab02f580fa59
parent 9dfe45a8
......@@ -901,16 +901,7 @@ static const vpx_prob default_skip_probs[SKIP_CONTEXTS] = {
192, 128, 64
};
#if CONFIG_EXT_INTERP && SWITCHABLE_FILTERS == 4
static const vpx_prob default_switchable_interp_prob[SWITCHABLE_FILTER_CONTEXTS]
[SWITCHABLE_FILTERS - 1] = {
{ 235, 192, 128},
{ 36, 243, 208},
{ 34, 16, 128},
{ 36, 243, 48},
{ 149, 160, 128},
};
#elif CONFIG_EXT_INTERP && SWITCHABLE_FILTERS == 5
#if CONFIG_EXT_INTERP
static const vpx_prob default_switchable_interp_prob[SWITCHABLE_FILTER_CONTEXTS]
[SWITCHABLE_FILTERS - 1] = {
{ 235, 192, 128, 128},
......@@ -1236,14 +1227,7 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
vp10_copy(fc->intra_ext_tx_prob, default_intra_ext_tx_prob);
}
#if CONFIG_EXT_INTERP && SWITCHABLE_FILTERS == 4
const vpx_tree_index vp10_switchable_interp_tree
[TREE_SIZE(SWITCHABLE_FILTERS)] = {
-EIGHTTAP_REGULAR, 2,
4, -MULTITAP_SHARP,
-EIGHTTAP_SMOOTH, -EIGHTTAP_SMOOTH2,
};
#elif CONFIG_EXT_INTERP && SWITCHABLE_FILTERS == 5
#if CONFIG_EXT_INTERP
const vpx_tree_index vp10_switchable_interp_tree
[TREE_SIZE(SWITCHABLE_FILTERS)] = {
-EIGHTTAP_REGULAR, 2,
......
......@@ -121,7 +121,6 @@ DECLARE_ALIGNED(256, static const int16_t,
{0, -1, 2, -4, 8, 127, -6, 3, -1, 0},
};
#if SWITCHABLE_FILTERS >= 4
DECLARE_ALIGNED(256, static const InterpKernel,
sub_pel_filters_8smooth2[SUBPEL_SHIFTS]) = {
// freqmultiplier = 0.35
......@@ -163,9 +162,7 @@ DECLARE_ALIGNED(256, static const InterpKernel,
{0, 2, -12, 37, 94, 14, -9, 2},
{0, 2, -11, 31, 95, 19, -10, 2},
};
#endif // SWITCHABLE_FILTERS >= 4
#if SWITCHABLE_FILTERS == 5
DECLARE_ALIGNED(16, static const int16_t,
sub_pel_filters_12sharp[SUBPEL_SHIFTS][12]) = {
// intfilt 0.85
......@@ -186,8 +183,6 @@ DECLARE_ALIGNED(16, static const int16_t,
{-1, 2, -2, 4, -8, 18, 124, -13, 6, -3, 2, -1},
{0, 1, -1, 2, -4, 8, 127, -7, 3, -2, 1, 0},
};
#endif
#else // CONFIG_EXT_INTERP
DECLARE_ALIGNED(256, static const InterpKernel,
......@@ -269,12 +264,8 @@ vp10_interp_filter_params_list[SWITCHABLE_FILTERS + 1] = {
{(const int16_t*)sub_pel_filters_8, SUBPEL_TAPS, SUBPEL_SHIFTS},
{(const int16_t*)sub_pel_filters_8smooth, SUBPEL_TAPS, SUBPEL_SHIFTS},
{(const int16_t*)sub_pel_filters_10sharp, 10, SUBPEL_SHIFTS},
#if SWITCHABLE_FILTERS >= 4
{(const int16_t*)sub_pel_filters_8smooth2, SUBPEL_TAPS, SUBPEL_SHIFTS},
#endif
#if SWITCHABLE_FILTERS == 5
{(const int16_t*)sub_pel_filters_12sharp, 12, SUBPEL_SHIFTS},
#endif
{(const int16_t*)bilinear_filters, SUBPEL_TAPS, SUBPEL_SHIFTS}
};
#else
......
......@@ -26,17 +26,13 @@ extern "C" {
#define MULTITAP_SHARP 2
#if CONFIG_EXT_INTERP
#define MAX_SUBPEL_TAPS 12
#define SUPPORT_NONINTERPOLATING_FILTERS 0 /* turn it on for experimentation */
#define SWITCHABLE_FILTERS 5 /* Number of switchable filters */
#if SWITCHABLE_FILTERS >= 4
#define EIGHTTAP_SMOOTH2 3
#endif
#if SWITCHABLE_FILTERS == 5
#define MULTITAP_SHARP2 4
#endif // SWITCHABLE_FILTERS
#define MAX_SUBPEL_TAPS 12
#define SUPPORT_NONINTERPOLATING_FILTERS 0 /* turn it on for experimentation */
#define SWITCHABLE_FILTERS 5 /* Number of switchable filters */
#else
#define SWITCHABLE_FILTERS 3 /* Number of switchable filters */
#endif // CONFIG_EXT_INTERP
......
......@@ -42,16 +42,13 @@
static const struct vp10_token intra_mode_encodings[INTRA_MODES] = {
{0, 1}, {6, 3}, {28, 5}, {30, 5}, {58, 6}, {59, 6}, {126, 7}, {127, 7},
{62, 6}, {2, 2}};
#if CONFIG_EXT_INTERP && SWITCHABLE_FILTERS == 4
static const struct vp10_token switchable_interp_encodings[SWITCHABLE_FILTERS] =
{{0, 1}, {4, 3}, {3, 2}, {5, 3}};
#elif CONFIG_EXT_INTERP && SWITCHABLE_FILTERS == 5
#if CONFIG_EXT_INTERP
static const struct vp10_token switchable_interp_encodings[SWITCHABLE_FILTERS] =
{{0, 1}, {4, 3}, {6, 3}, {5, 3}, {7, 3}};
#else
static const struct vp10_token switchable_interp_encodings[SWITCHABLE_FILTERS] =
{{0, 1}, {2, 2}, {3, 2}};
#endif // CONFIG_EXT_INTERP && SWITCHABLE_FILTERS == 4
#endif // CONFIG_EXT_INTERP
#if CONFIG_EXT_PARTITION_TYPES
static const struct vp10_token ext_partition_encodings[EXT_PARTITION_TYPES] =
{{0, 1}, {4, 3}, {12, 4}, {7, 3}, {10, 4}, {11, 4}, {26, 5}, {27, 5}};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment