Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Guillaume Martres
aom-rav1e
Commits
1e4473b2
Commit
1e4473b2
authored
May 27, 2015
by
Johann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check size restrictions before running test vector
Change-Id: I60ea7724e6ab06fc658f678c1b76d984a43f5a5e
parent
ed93470a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
test/test_vectors.cc
test/test_vectors.cc
+3
-0
vp9/decoder/vp9_decodeframe.c
vp9/decoder/vp9_decodeframe.c
+2
-1
No files found.
test/test_vectors.cc
View file @
1e4473b2
...
...
@@ -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"
,
...
...
vp9/decoder/vp9_decodeframe.c
View file @
1e4473b2
...
...
@@ -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
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment