shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: fix crash in mt loopfilter w/corrupt file"

--- a/test/invalid_file_test.cc

+++ b/test/invalid_file_test.cc

@@ -144,6 +144,8 @@

 const DecodeParam kMultiThreadedVP9InvalidFileTests[] = {

   {4, "invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm"},

+  {4, "invalid-"

+      "vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf"},

 };

 INSTANTIATE_TEST_CASE_P(

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

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

@@ -681,3 +681,5 @@

 c77e4a26616add298a05dd5d12397be22c0e40c5  vp90-2-18-resize.ivf

 c12918cf0a716417fba2de35c3fc5ab90e52dfce  vp90-2-18-resize.ivf.md5

 717da707afcaa1f692ff1946f291054eb75a4f06  screendata.y4m

+b7c1296630cdf1a7ef493d15ff4f9eb2999202f6  invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf

+0a3884edb3fd8f9d9b500223e650f7de257b67d8  invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf.res

--- a/test/test.mk

+++ b/test/test.mk

@@ -801,6 +801,8 @@

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-.ivf.res

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-z.ivf

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-z.ivf.res

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x2_frame_parallel.webm.ivf.s47039_r01-05_b6-.ivf.res

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm.res

--- a/vp9/decoder/vp9_dthread.c

+++ b/vp9/decoder/vp9_dthread.c

@@ -147,7 +147,7 @@

   // Allocate memory used in thread synchronization.

   // This always needs to be done even if frame_filter_level is 0.

-  if (!cm->current_video_frame || cm->last_height != cm->height) {

+  if (!lf_sync->sync_range || cm->last_height != cm->height) {

     if (cm->last_height != cm->height) {

       const int aligned_last_height =

           ALIGN_POWER_OF_TWO(cm->last_height, MI_SIZE_LOG2);