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

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

Issue 11419224: Add missing (and remove superfluous) 'explicit' from constructors. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + remove non-straightforward changes Created 7 years, 11 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 | « media/base/media_log.h ('k') | net/base/mock_file_stream.h » ('j') | 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 const char* video_md5; 53 const char* video_md5;
54 const char* audio_md5; 54 const char* audio_md5;
55 const char* filename; 55 const char* filename;
56 PipelineStatus init_status; 56 PipelineStatus init_status;
57 PipelineStatus end_status; 57 PipelineStatus end_status;
58 }; 58 };
59 59
60 // Used for tests which just need to run without crashing or tooling errors, but 60 // Used for tests which just need to run without crashing or tooling errors, but
61 // which may have undefined behavior for hashing, etc. 61 // which may have undefined behavior for hashing, etc.
62 struct FlakyRegressionTestData { 62 struct FlakyRegressionTestData {
63 FlakyRegressionTestData(const char* filename) 63 explicit FlakyRegressionTestData(const char* filename)
64 : filename(filename) { 64 : filename(filename) {
65 } 65 }
66 66
67 const char* filename; 67 const char* filename;
68 }; 68 };
69 69
70 class FFmpegRegressionTest 70 class FFmpegRegressionTest
71 : public testing::TestWithParam<RegressionTestData>, 71 : public testing::TestWithParam<RegressionTestData>,
72 public PipelineIntegrationTestBase { 72 public PipelineIntegrationTestBase {
73 }; 73 };
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 } 358 }
359 359
360 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) { 360 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) {
361 if (Start(GetTestDataFilePath(GetParam().filename))) { 361 if (Start(GetTestDataFilePath(GetParam().filename))) {
362 Play(); 362 Play();
363 WaitUntilEndedOrError(); 363 WaitUntilEndedOrError();
364 } 364 }
365 } 365 }
366 366
367 } // namespace media 367 } // namespace media
OLDNEW
« no previous file with comments | « media/base/media_log.h ('k') | net/base/mock_file_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698