Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: media/ffmpeg/ffmpeg_regression_tests.cc

Issue 9693060: Roll deps for ffmpeg security fixes and add new test case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // Regression tests for FFmpeg. Security test files can be found in the 5 // Regression tests for FFmpeg. Security test files can be found in the
6 // internal media test data directory: 6 // internal media test data directory:
7 // 7 //
8 // svn://svn.chromium.org/chrome-internal/trunk/data/media/security/ 8 // svn://svn.chromium.org/chrome-internal/trunk/data/media/security/
9 // 9 //
10 // Simply add the custom_dep below to your gclient and sync: 10 // Simply add the custom_dep below to your gclient and sync:
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // General WebM test cases. 129 // General WebM test cases.
130 FFMPEG_TEST_CASE(WEBM_1, "security/no-bug.webm", PIPELINE_OK, PIPELINE_OK); 130 FFMPEG_TEST_CASE(WEBM_1, "security/no-bug.webm", PIPELINE_OK, PIPELINE_OK);
131 FFMPEG_TEST_CASE(WEBM_2, "security/uninitialize.webm", PIPELINE_ERROR_DECODE, 131 FFMPEG_TEST_CASE(WEBM_2, "security/uninitialize.webm", PIPELINE_ERROR_DECODE,
132 PIPELINE_ERROR_DECODE); 132 PIPELINE_ERROR_DECODE);
133 FFMPEG_TEST_CASE(WEBM_3, "security/out.webm.139771.2965", 133 FFMPEG_TEST_CASE(WEBM_3, "security/out.webm.139771.2965",
134 DECODER_ERROR_NOT_SUPPORTED, DECODER_ERROR_NOT_SUPPORTED); 134 DECODER_ERROR_NOT_SUPPORTED, DECODER_ERROR_NOT_SUPPORTED);
135 FFMPEG_TEST_CASE(WEBM_4, "security/out.webm.68798.1929", 135 FFMPEG_TEST_CASE(WEBM_4, "security/out.webm.68798.1929",
136 DECODER_ERROR_NOT_SUPPORTED, DECODER_ERROR_NOT_SUPPORTED); 136 DECODER_ERROR_NOT_SUPPORTED, DECODER_ERROR_NOT_SUPPORTED);
137 FFMPEG_TEST_CASE(WEBM_5, "content/frame_size_change.webm", PIPELINE_OK, 137 FFMPEG_TEST_CASE(WEBM_5, "content/frame_size_change.webm", PIPELINE_OK,
138 PIPELINE_OK); 138 PIPELINE_OK);
139 FFMPEG_TEST_CASE(WEBM_6, "security/117912.webm", DEMUXER_ERROR_COULD_NOT_OPEN,
140 DEMUXER_ERROR_COULD_NOT_OPEN);
139 141
140 // Flaky, maybe larger issues. All eventually fail in the browser. 142 // Flaky, maybe larger issues. All eventually fail in the browser.
141 FFMPEG_TEST_CASE(FLAKY_Cr99652, "security/99652.webm", PIPELINE_OK, 143 FFMPEG_TEST_CASE(FLAKY_Cr99652, "security/99652.webm", PIPELINE_OK,
142 PIPELINE_ERROR_DECODE); 144 PIPELINE_ERROR_DECODE);
143 FFMPEG_TEST_CASE(FLAKY_Cr100464, "security/100464.webm", PIPELINE_OK, 145 FFMPEG_TEST_CASE(FLAKY_Cr100464, "security/100464.webm", PIPELINE_OK,
144 PIPELINE_ERROR_DECODE); 146 PIPELINE_ERROR_DECODE);
145 FFMPEG_TEST_CASE(FLAKY_Cr111342, "security/111342.ogm", PIPELINE_OK, 147 FFMPEG_TEST_CASE(FLAKY_Cr111342, "security/111342.ogm", PIPELINE_OK,
146 PIPELINE_ERROR_DECODE); 148 PIPELINE_ERROR_DECODE);
147 FFMPEG_TEST_CASE(FLAKY_MP4_3, "security/clockh264aac_300413969.mp4", 149 FFMPEG_TEST_CASE(FLAKY_MP4_3, "security/clockh264aac_300413969.mp4",
148 PIPELINE_OK, PIPELINE_ERROR_DECODE); 150 PIPELINE_OK, PIPELINE_ERROR_DECODE);
(...skipping 21 matching lines...) Expand all
170 // Check for ended if the pipeline is expected to finish okay. 172 // Check for ended if the pipeline is expected to finish okay.
171 if (GetParam().end_status == PIPELINE_OK) 173 if (GetParam().end_status == PIPELINE_OK)
172 ASSERT_TRUE(ended_); 174 ASSERT_TRUE(ended_);
173 } else { 175 } else {
174 ASSERT_FALSE(Start(GetTestDataURL(GetParam().filename), 176 ASSERT_FALSE(Start(GetTestDataURL(GetParam().filename),
175 GetParam().init_status)); 177 GetParam().init_status));
176 } 178 }
177 } 179 }
178 180
179 } // namespace media 181 } // namespace media
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698