shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Check size restrictions before running test vector"

--- a/test/test_vectors.cc

+++ b/test/test_vectors.cc

@@ -165,7 +165,10 @@

   "vp90-2-11-size-351x287.webm", "vp90-2-11-size-351x288.webm",

   "vp90-2-11-size-352x287.webm", "vp90-2-12-droppable_1.ivf",

   "vp90-2-12-droppable_2.ivf", "vp90-2-12-droppable_3.ivf",

+#if !CONFIG_SIZE_LIMIT || \

+    (DECODE_WIDTH_LIMIT >= 20400 && DECODE_HEIGHT_LIMIT >= 120)

   "vp90-2-13-largescaling.webm",

+#endif

   "vp90-2-14-resize-fp-tiles-1-16.webm",

   "vp90-2-14-resize-fp-tiles-1-2-4-8-16.webm",

   "vp90-2-14-resize-fp-tiles-1-2.webm", "vp90-2-14-resize-fp-tiles-1-4.webm",

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -699,7 +699,8 @@

 #if CONFIG_SIZE_LIMIT

   if (width > DECODE_WIDTH_LIMIT || height > DECODE_HEIGHT_LIMIT)

     vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,

-                       "Width and height beyond allowed size.");

+                       "Dimensions of %dx%d beyond allowed size of %dx%d.",

+                       width, height, DECODE_WIDTH_LIMIT, DECODE_HEIGHT_LIMIT);

 #endif

   if (cm->width != width || cm->height != height) {

     const int new_mi_rows =