media/ffmpeg/ffmpeg_regression_tests.cc - Issue 1376913003: Roll ffmpeg DEPS for security fix.

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

Issue 1376913003: Roll ffmpeg DEPS for security fix. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add DEPS, roll out DCHECK. Created 5 years, 2 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

OLD	NEW
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. Test files can be found in the internal media	5 // Regression tests for FFmpeg. Test files can be found in the internal media

6 // test data directory:	6 // test data directory:

7 //	7 //

8 // https://chrome-internal.googlesource.com/chrome/data/media	8 // https://chrome-internal.googlesource.com/chrome/data/media

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 120 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 DEMUXER_ERROR_COULD_NOT_OPEN,	131 DEMUXER_ERROR_COULD_NOT_OPEN,

132 DEMUXER_ERROR_COULD_NOT_OPEN);	132 DEMUXER_ERROR_COULD_NOT_OPEN);

133 FFMPEG_TEST_CASE(Cr444539,	133 FFMPEG_TEST_CASE(Cr444539,

134 "security/444539.m4a",	134 "security/444539.m4a",

135 DEMUXER_ERROR_COULD_NOT_OPEN,	135 DEMUXER_ERROR_COULD_NOT_OPEN,

136 DEMUXER_ERROR_COULD_NOT_OPEN);	136 DEMUXER_ERROR_COULD_NOT_OPEN);

137 FFMPEG_TEST_CASE(Cr444546,	137 FFMPEG_TEST_CASE(Cr444546,

138 "security/444546.mp4",	138 "security/444546.mp4",

139 DEMUXER_ERROR_COULD_NOT_OPEN,	139 DEMUXER_ERROR_COULD_NOT_OPEN,

140 DEMUXER_ERROR_COULD_NOT_OPEN);	140 DEMUXER_ERROR_COULD_NOT_OPEN);

	141 FFMPEG_TEST_CASE(Cr447860,

	142 "security/447860.webm",

	143 PIPELINE_OK,

	144 PIPELINE_OK);

141 FFMPEG_TEST_CASE(Cr449958,	145 FFMPEG_TEST_CASE(Cr449958,

142 "security/449958.webm",	146 "security/449958.webm",

143 PIPELINE_OK,	147 PIPELINE_OK,

144 PIPELINE_ERROR_DECODE);	148 PIPELINE_ERROR_DECODE);

145 FFMPEG_TEST_CASE(Cr536601,	149 FFMPEG_TEST_CASE(Cr536601,

146 "security/536601.m4a",	150 "security/536601.m4a",

147 PIPELINE_OK,	151 PIPELINE_OK,

148 PIPELINE_OK);	152 PIPELINE_OK);

	153 FFMPEG_TEST_CASE(Cr532967,

	154 "security/532967.webm",

	155 PIPELINE_OK,

	156 PIPELINE_OK);

149	157

150 // General MP4 test cases.	158 // General MP4 test cases.

151 FFMPEG_TEST_CASE(MP4_0,	159 FFMPEG_TEST_CASE(MP4_0,

152 "security/aac.10419.mp4",	160 "security/aac.10419.mp4",

153 DEMUXER_ERROR_COULD_NOT_OPEN,	161 DEMUXER_ERROR_COULD_NOT_OPEN,

154 DEMUXER_ERROR_COULD_NOT_OPEN);	162 DEMUXER_ERROR_COULD_NOT_OPEN);

155 FFMPEG_TEST_CASE(MP4_1,	163 FFMPEG_TEST_CASE(MP4_1,

156 "security/clockh264aac_200021889.mp4",	164 "security/clockh264aac_200021889.mp4",

157 DEMUXER_ERROR_COULD_NOT_OPEN,	165 DEMUXER_ERROR_COULD_NOT_OPEN,

158 DEMUXER_ERROR_COULD_NOT_OPEN);	166 DEMUXER_ERROR_COULD_NOT_OPEN);

(...skipping 187 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
346 }	354 }

347	355

348 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) {	356 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) {

349 if (Start(GetParam().filename, kClockless) == PIPELINE_OK) {	357 if (Start(GetParam().filename, kClockless) == PIPELINE_OK) {

350 Play();	358 Play();

351 WaitUntilEndedOrError();	359 WaitUntilEndedOrError();

352 }	360 }

353 }	361 }

354	362

355 } // namespace media	363 } // namespace media

OLD	NEW

« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »