diff options
| author | Deb Mukherjee <debargha@google.com> | 2013-02-21 09:23:49 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-02-21 09:23:50 -0800 |
| commit | 048f59370329c0ad78a1e81e0bb8484ed18c736b (patch) | |
| tree | 16678f5269c551a43391baabc47e699bc088b01b /vp9/common | |
| parent | 138ffb6ea96cfab0f1ccce9130a07496a069aea3 (diff) | |
| parent | 28b1db92783bdb8919bcaefe174a715009c5e444 (diff) | |
| download | libvpx-048f59370329c0ad78a1e81e0bb8484ed18c736b.tar libvpx-048f59370329c0ad78a1e81e0bb8484ed18c736b.tar.gz libvpx-048f59370329c0ad78a1e81e0bb8484ed18c736b.tar.bz2 libvpx-048f59370329c0ad78a1e81e0bb8484ed18c736b.zip | |
Merge "Refactoring of switchable filter search for speed" into experimental
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 8 | ||||
| -rw-r--r-- | vp9/common/vp9_entropymode.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 30e5336a2..23b2abef7 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -423,6 +423,14 @@ 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() { diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index aa06e49c6..345eb0253 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -104,6 +104,8 @@ extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp extern const int vp9_switchable_interp_map[SWITCHABLE + 1]; +extern const int vp9_is_interpolating_filter[SWITCHABLE + 1]; + extern const vp9_tree_index vp9_switchable_interp_tree [2 * (VP9_SWITCHABLE_FILTERS - 1)]; |