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

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

Issue 15844005: Roll FFmpeg for bug fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 FFMPEG_TEST_CASE(Cr108416, "security/108416.webm", PIPELINE_OK, PIPELINE_OK, 116 FFMPEG_TEST_CASE(Cr108416, "security/108416.webm", PIPELINE_OK, PIPELINE_OK,
117 "5cb3a934795cd552753dec7687928291", 117 "5cb3a934795cd552753dec7687928291",
118 "-17.87,-37.20,-23.33,45.57,8.13,-9.92,"); 118 "-17.87,-37.20,-23.33,45.57,8.13,-9.92,");
119 FFMPEG_TEST_CASE(Cr110849, "security/110849.mkv", 119 FFMPEG_TEST_CASE(Cr110849, "security/110849.mkv",
120 DEMUXER_ERROR_COULD_NOT_OPEN, 120 DEMUXER_ERROR_COULD_NOT_OPEN,
121 DEMUXER_ERROR_NO_SUPPORTED_STREAMS, 121 DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
122 kNullVideoHash, kNullAudioHash); 122 kNullVideoHash, kNullAudioHash);
123 FFMPEG_TEST_CASE(Cr112384, "security/112384.webm", 123 FFMPEG_TEST_CASE(Cr112384, "security/112384.webm",
124 DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE, 124 DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE,
125 kNullVideoHash, kNullAudioHash); 125 kNullVideoHash, kNullAudioHash);
126
127 FFMPEG_TEST_CASE(Cr117912, "security/117912.webm", DEMUXER_ERROR_COULD_NOT_OPEN, 126 FFMPEG_TEST_CASE(Cr117912, "security/117912.webm", DEMUXER_ERROR_COULD_NOT_OPEN,
128 DEMUXER_ERROR_COULD_NOT_OPEN, kNullVideoHash, kNullAudioHash); 127 DEMUXER_ERROR_COULD_NOT_OPEN, kNullVideoHash, kNullAudioHash);
129 FFMPEG_TEST_CASE(Cr123481, "security/123481.ogv", PIPELINE_OK, 128 FFMPEG_TEST_CASE(Cr123481, "security/123481.ogv", PIPELINE_OK,
130 PIPELINE_OK, "e6dd853fcbd746c8bb2ab2b8fc376fc7", 129 PIPELINE_OK, "e6dd853fcbd746c8bb2ab2b8fc376fc7",
131 "1.28,-0.32,-0.81,0.08,1.66,0.89,"); 130 "1.28,-0.32,-0.81,0.08,1.66,0.89,");
132 FFMPEG_TEST_CASE(Cr132779, "security/132779.webm", 131 FFMPEG_TEST_CASE(Cr132779, "security/132779.webm",
133 DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE, 132 DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE,
134 kNullVideoHash, kNullAudioHash); 133 kNullVideoHash, kNullAudioHash);
135 FFMPEG_TEST_CASE(Cr140165, "security/140165.ogg", PIPELINE_ERROR_DECODE, 134 FFMPEG_TEST_CASE(Cr140165, "security/140165.ogg", PIPELINE_ERROR_DECODE,
136 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash); 135 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash);
137 FFMPEG_TEST_CASE(Cr140647, "security/140647.ogv", DEMUXER_ERROR_COULD_NOT_OPEN, 136 FFMPEG_TEST_CASE(Cr140647, "security/140647.ogv", DEMUXER_ERROR_COULD_NOT_OPEN,
138 DEMUXER_ERROR_COULD_NOT_OPEN, kNullVideoHash, kNullAudioHash); 137 DEMUXER_ERROR_COULD_NOT_OPEN, kNullVideoHash, kNullAudioHash);
139 FFMPEG_TEST_CASE(Cr142738, "content/crbug142738.ogg", PIPELINE_OK, PIPELINE_OK, 138 FFMPEG_TEST_CASE(Cr142738, "content/crbug142738.ogg", PIPELINE_OK, PIPELINE_OK,
140 kNullVideoHash, 139 kNullVideoHash,
141 "-1.22,0.45,1.79,1.80,-0.30,-1.21,"); 140 "-1.22,0.45,1.79,1.80,-0.30,-1.21,");
142 FFMPEG_TEST_CASE(Cr152691, "security/152691.mp3", PIPELINE_ERROR_DECODE, 141 FFMPEG_TEST_CASE(Cr152691, "security/152691.mp3", PIPELINE_ERROR_DECODE,
143 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash); 142 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash);
144 FFMPEG_TEST_CASE(Cr161639, "security/161639.m4a", PIPELINE_ERROR_DECODE, 143 FFMPEG_TEST_CASE(Cr161639, "security/161639.m4a", PIPELINE_ERROR_DECODE,
145 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash); 144 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash);
146 FFMPEG_TEST_CASE(Cr222754, "security/222754.mp4", PIPELINE_ERROR_DECODE, 145 FFMPEG_TEST_CASE(Cr222754, "security/222754.mp4", PIPELINE_ERROR_DECODE,
147 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash); 146 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash);
148 FFMPEG_TEST_CASE(Cr234630a, "security/234630a.mov", PIPELINE_OK, 147 FFMPEG_TEST_CASE(Cr234630a, "security/234630a.mov", PIPELINE_OK,
149 PIPELINE_OK, kNullVideoHash, 148 PIPELINE_OK, kNullVideoHash,
150 "-15.52,-18.90,-15.33,-16.68,-14.41,-15.89,"); 149 "-15.52,-18.90,-15.33,-16.68,-14.41,-15.89,");
151 FFMPEG_TEST_CASE(Cr234630b, "security/234630b.mov", PIPELINE_ERROR_DECODE, 150 FFMPEG_TEST_CASE(Cr234630b, "security/234630b.mov", PIPELINE_ERROR_DECODE,
152 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash); 151 PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash);
152 FFMPEG_TEST_CASE(Cr242786, "security/242786.webm", PIPELINE_OK,
153 PIPELINE_OK, kNullVideoHash,
154 "-1.72,-0.83,0.84,1.70,1.23,-0.53,");
153 155
154 // General MP4 test cases. 156 // General MP4 test cases.
155 FFMPEG_TEST_CASE(MP4_0, "security/aac.10419.mp4", DEMUXER_ERROR_COULD_NOT_OPEN, 157 FFMPEG_TEST_CASE(MP4_0, "security/aac.10419.mp4", DEMUXER_ERROR_COULD_NOT_OPEN,
156 DEMUXER_ERROR_COULD_NOT_OPEN, kNullVideoHash, kNullAudioHash); 158 DEMUXER_ERROR_COULD_NOT_OPEN, kNullVideoHash, kNullAudioHash);
157 FFMPEG_TEST_CASE(MP4_1, "security/clockh264aac_200021889.mp4", 159 FFMPEG_TEST_CASE(MP4_1, "security/clockh264aac_200021889.mp4",
158 DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN, 160 DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN,
159 kNullVideoHash, kNullAudioHash); 161 kNullVideoHash, kNullAudioHash);
160 FFMPEG_TEST_CASE(MP4_2, "security/clockh264aac_200701257.mp4", PIPELINE_OK, 162 FFMPEG_TEST_CASE(MP4_2, "security/clockh264aac_200701257.mp4", PIPELINE_OK,
161 PIPELINE_OK, kNullVideoHash, kNullAudioHash); 163 PIPELINE_OK, kNullVideoHash, kNullAudioHash);
162 FFMPEG_TEST_CASE(MP4_5, "security/clockh264aac_3022500.mp4", 164 FFMPEG_TEST_CASE(MP4_5, "security/clockh264aac_3022500.mp4",
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 } 381 }
380 382
381 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) { 383 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) {
382 if (Start(GetTestDataFilePath(GetParam().filename))) { 384 if (Start(GetTestDataFilePath(GetParam().filename))) {
383 Play(); 385 Play();
384 WaitUntilEndedOrError(); 386 WaitUntilEndedOrError();
385 } 387 }
386 } 388 }
387 389
388 } // namespace media 390 } // 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