shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fixing problem with invalid delta_q reading."

--- a/test/test-data.sha1

+++ b/test/test-data.sha1

@@ -522,3 +522,5 @@

 94ad19b8b699cea105e2ff18f0df2afd7242bcf7  vp90-2-03-size-226x226.webm.md5

 495256cfd123fe777b2c0406862ed8468a1f4677  vp91-2-04-yv444.webm

 65e3a7ffef61ab340d9140f335ecc49125970c2c  vp91-2-04-yv444.webm.md5

+b6524e4084d15b5d0caaa3d3d1368db30cbee69c  vp90-2-03-deltaq.webm

+65f45ec9a55537aac76104818278e0978f94a678  vp90-2-03-deltaq.webm.md5

--- a/test/test.mk

+++ b/test/test.mk

@@ -629,5 +629,7 @@

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-03-size-226x224.webm.md5

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-03-size-226x226.webm

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-03-size-226x226.webm.md5

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-03-deltaq.webm

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-03-deltaq.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

@@ -159,7 +159,7 @@

   "vp90-2-03-size-226x198.webm", "vp90-2-03-size-226x200.webm",

   "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-size-226x226.webm", "vp90-2-03-deltaq.webm",

 #if CONFIG_NON420

   "vp91-2-04-yv444.webm"

 #endif

--- a/vp9/decoder/vp9_decodframe.c

+++ b/vp9/decoder/vp9_decodframe.c

@@ -454,8 +454,7 @@

 static int read_delta_q(struct vp9_read_bit_buffer *rb, int *delta_q) {

   const int old = *delta_q;

-  if (vp9_rb_read_bit(rb))

-    *delta_q = vp9_rb_read_signed_literal(rb, 4);

+  *delta_q = vp9_rb_read_bit(rb) ? vp9_rb_read_signed_literal(rb, 4) : 0;

   return old != *delta_q;

 }