diff options
author | Johann <johannkoenig@google.com> | 2013-10-02 18:29:43 -0700 |
---|---|---|
committer | Johann <johannkoenig@google.com> | 2013-10-02 18:32:27 -0700 |
commit | e6eeaaa14ccef4c0938fcce21c54979204041a30 (patch) | |
tree | 63828ad2107f2c97fcb0598127f0fb71d1eb2c9c | |
parent | 1184aebb761cbeac9124c37189a80a1a58f04b6b (diff) | |
download | libvpx-kitkat-cts-dev.tar.gz |
Support bilinear filter in VP9android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9kitkat-releasekitkat-cts-releasekitkat-cts-dev
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libvpx/vp9/decoder/vp9_decodframe.c b/libvpx/vp9/decoder/vp9_decodframe.c index 34ed0c759..dbba28e14 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)]; } |