diff options
| author | Johann <johannkoenig@google.com> | 2015-05-27 15:27:34 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2015-05-27 15:55:17 -0700 |
| commit | 1e4473b216c1821cac91c9b68176e54df7846543 (patch) | |
| tree | 43620ce0f0babea33b9fe079dbe798a183433b83 | |
| parent | ed93470a69818c6fd7994fecbcf7fb1a7e8d2ccd (diff) | |
| download | libvpx-1e4473b216c1821cac91c9b68176e54df7846543.tar libvpx-1e4473b216c1821cac91c9b68176e54df7846543.tar.gz libvpx-1e4473b216c1821cac91c9b68176e54df7846543.tar.bz2 libvpx-1e4473b216c1821cac91c9b68176e54df7846543.zip | |
Check size restrictions before running test vector
Change-Id: I60ea7724e6ab06fc658f678c1b76d984a43f5a5e
| -rw-r--r-- | test/test_vectors.cc | 3 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/test_vectors.cc b/test/test_vectors.cc index 07d306ff4..434a38251 100644 --- a/test/test_vectors.cc +++ b/test/test_vectors.cc @@ -165,7 +165,10 @@ const char *const kVP9TestVectors[] = { "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", diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index fcf480b86..0e9b1c523 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -699,7 +699,8 @@ static void resize_context_buffers(VP9_COMMON *cm, int width, int height) { #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 = |