diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 22:01:05 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 22:01:05 +0000 |
| commit | 3d7ade18caf86777d59fc88e5aa2be449da37bee (patch) | |
| tree | c8a7e6056f0a997dd19b5cb36113e650e35ccd39 /media | |
| parent | fecb03b2ee6edacdef469c3b711360cc9f52a8ab (diff) | |
| download | chromium_src-3d7ade18caf86777d59fc88e5aa2be449da37bee.zip chromium_src-3d7ade18caf86777d59fc88e5aa2be449da37bee.tar.gz chromium_src-3d7ade18caf86777d59fc88e5aa2be449da37bee.tar.bz2 | |
media: Enable VP9 tests.
BUG=180280
Review URL: https://chromiumcodereview.appspot.com/18858004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/pipeline_integration_test.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc index dcdd339..89af94a 100644 --- a/media/filters/pipeline_integration_test.cc +++ b/media/filters/pipeline_integration_test.cc @@ -55,7 +55,7 @@ static const int k640WebMFileDurationMs = 2763; static const int k640IsoFileDurationMs = 2737; static const int k640IsoCencFileDurationMs = 2736; static const int k1280IsoFileDurationMs = 2736; -static const int kVP9WebMFileDurationMs = 2736; +static const int kVP9WebMFileDurationMs = 2735; static const int kVP8AWebMFileDurationMs = 2700; // Note: Tests using this class only exercise the DecryptingDemuxerStream path. @@ -453,10 +453,9 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) { Stop(); } -// TODO(fgalligan): Enable after new vp9 files are landed. crbug.com/180280 TEST_F(PipelineIntegrationTest, - DISABLED_BasicPlayback_MediaSource_VideoOnly_VP9_WebM) { - MockMediaSource source("bear-vp9.webm", kWebMVP9, 19678); + BasicPlayback_MediaSource_VideoOnly_VP9_WebM) { + MockMediaSource source("bear-vp9.webm", kWebMVP9, 32393); StartPipelineWithMediaSource(&source); source.EndOfStream(); @@ -915,8 +914,7 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) { } // Verify that VP9 video in WebM containers can be played back. -// TODO(fgalligan): Enable after new vp9 files are landed. crbug.com/180280 -TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VideoOnly_VP9_WebM) { +TEST_F(PipelineIntegrationTest, BasicPlayback_VideoOnly_VP9_WebM) { ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9.webm"), PIPELINE_OK)); Play(); @@ -925,8 +923,7 @@ TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VideoOnly_VP9_WebM) { // Verify that VP9 video and Opus audio in the same WebM container can be played // back. -// TODO(fgalligan): Enable after new vp9 files are landed. crbug.com/180280 -TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) { +TEST_F(PipelineIntegrationTest, BasicPlayback_VP9_Opus_WebM) { ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"), PIPELINE_OK)); Play(); |