| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index ff846d62e4c837f19e5222e7e51467efc0becac7..86e661fc11cc927d6747d6ce86d52e7215b956f1 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -60,7 +60,7 @@ const int kAppendTimeMs = kAppendTimeSec * 1000;
|
| const int k320WebMFileDurationMs = 2737;
|
| const int k640WebMFileDurationMs = 2763;
|
| const int kOpusEndTrimmingWebMFileDurationMs = 2771;
|
| -const int kVP9WebMFileDurationMs = 2735;
|
| +const int kVP9WebMFileDurationMs = 2703;
|
| const int kVP8AWebMFileDurationMs = 2700;
|
|
|
| #if defined(USE_PROPRIETARY_CODECS)
|
| @@ -517,11 +517,8 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
|
| Stop();
|
| }
|
|
|
| -// TODO(fgalligan): Enable after new vp9 files are landed.
|
| -// http://crbug.com/259116
|
| -TEST_F(PipelineIntegrationTest,
|
| - DISABLED_BasicPlayback_MediaSource_VideoOnly_VP9_WebM) {
|
| - MockMediaSource source("bear-vp9.webm", kWebMVP9, 32393);
|
| +TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VP9_WebM) {
|
| + MockMediaSource source("bear-vp9.webm", kWebMVP9, 67504);
|
| StartPipelineWithMediaSource(&source);
|
| source.EndOfStream();
|
|
|
| @@ -1072,9 +1069,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.
|
| -// http://crbug.com/259116
|
| -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();
|
| @@ -1083,9 +1078,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.
|
| -// http://crbug.com/259116
|
| -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();
|
|
|