ref: 6cb6987d4d9a2655bc9b294aff1a89519071384b
parent: ece99b3da099deced394d4d3fad0df06623957f5
parent: 68a3e4a8887688c3ebef56ed65d9cf31529d4191
author: Dmitry Kovalev <[email protected]>
date: Thu Oct 3 05:34:26 EDT 2013
Merge "BITSTREAM - RESTORING BILINEAR INTERPOLATION FILTER SUPPORT"
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -524,6 +524,8 @@
65f45ec9a55537aac76104818278e0978f94a678 vp90-2-03-deltaq.webm.md5
4dbb87494c7f565ffc266c98d17d0d8c7a5c5aba vp90-2-05-resize.ivf
7f6d8879336239a43dbb6c9f13178cb11cf7ed09 vp90-2-05-resize.ivf.md5
+bf61ddc1f716eba58d4c9837d4e91031d9ce4ffe vp90-2-06-bilinear.webm
+f6235f937552e11d8eb331ec55da6b3aa596b9ac vp90-2-06-bilinear.webm.md5
495256cfd123fe777b2c0406862ed8468a1f4677 vp91-2-04-yv444.webm
65e3a7ffef61ab340d9140f335ecc49125970c2c vp91-2-04-yv444.webm.md5
--- a/test/test.mk
+++ b/test/test.mk
@@ -633,5 +633,7 @@
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-03-deltaq.webm.md5
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-05-resize.ivf
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-05-resize.ivf.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-06-bilinear.webm
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-06-bilinear.webm.md5
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yv444.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yv444.webm.md5
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -160,7 +160,7 @@
"vp90-2-03-size-226x202.webm", "vp90-2-03-size-226x208.webm",
"vp90-2-03-size-226x210.webm", "vp90-2-03-size-226x224.webm",
"vp90-2-03-size-226x226.webm", "vp90-2-03-deltaq.webm",
- "vp90-2-05-resize.ivf",
+ "vp90-2-05-resize.ivf", "vp90-2-06-bilinear.webm",
#if CONFIG_NON420
"vp91-2-04-yv444.webm"
#endif
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -503,7 +503,8 @@
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)];
}
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1152,7 +1152,7 @@
static void write_interp_filter_type(INTERPOLATIONFILTERTYPE type,
struct vp9_write_bit_buffer *wb) {- const int type_to_literal[] = { 1, 0, 2 };+ const int type_to_literal[] = { 1, 0, 2, 3 };vp9_wb_write_bit(wb, type == SWITCHABLE);
if (type != SWITCHABLE)