Merge "Merge 12sharp filter into ext-interp" into nextgenv2

This commit is contained in:
Angie Chiang
2016-02-23 01:26:23 +00:00
committed by Gerrit Code Review
4 changed files with 63 additions and 33 deletions

View File

@@ -42,6 +42,9 @@ static const struct vp10_token intra_mode_encodings[INTRA_MODES] = {
#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
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}};