summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2013-10-02 18:29:43 -0700
committerJohann <johannkoenig@google.com>2013-10-02 18:32:27 -0700
commite6eeaaa14ccef4c0938fcce21c54979204041a30 (patch)
tree63828ad2107f2c97fcb0598127f0fb71d1eb2c9c
parent1184aebb761cbeac9124c37189a80a1a58f04b6b (diff)
downloadandroid_external_libvpx-e6eeaaa14ccef4c0938fcce21c54979204041a30.tar.gz
android_external_libvpx-e6eeaaa14ccef4c0938fcce21c54979204041a30.tar.bz2
android_external_libvpx-e6eeaaa14ccef4c0938fcce21c54979204041a30.zip
Support bilinear filter in VP9
Cherry pick vp9/decoder/vp9_decodframe.c from Ia3bbf57318e0cc61a1b724fe751e3f9c7e11b337 from upstream libvpx Bug: 11051984 Change-Id: I4cd4201f733463995208a3585462b7efc999b840
-rw-r--r--libvpx/vp9/decoder/vp9_decodframe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libvpx/vp9/decoder/vp9_decodframe.c b/libvpx/vp9/decoder/vp9_decodframe.c
index 34ed0c7..dbba28e 100644
--- a/libvpx/vp9/decoder/vp9_decodframe.c
+++ b/libvpx/vp9/decoder/vp9_decodframe.c
@@ -492,7 +492,8 @@ static INTERPOLATIONFILTERTYPE read_interp_filter_type(
struct vp9_read_bit_buffer *rb) {
const INTERPOLATIONFILTERTYPE literal_to_type[] = { EIGHTTAP_SMOOTH,
EIGHTTAP,
- EIGHTTAP_SHARP };
+ EIGHTTAP_SHARP,
+ BILINEAR };
return vp9_rb_read_bit(rb) ? SWITCHABLE
: literal_to_type[vp9_rb_read_literal(rb, 2)];
}