media: Re-enable VP9 tests.

BUG=259116

Review URL: https://codereview.chromium.org/189213004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255688 0039d316-1c4b-4281-b951-d872f2087c98
parent 9367e039
...@@ -60,7 +60,7 @@ const int kAppendTimeMs = kAppendTimeSec * 1000; ...@@ -60,7 +60,7 @@ const int kAppendTimeMs = kAppendTimeSec * 1000;
const int k320WebMFileDurationMs = 2737; const int k320WebMFileDurationMs = 2737;
const int k640WebMFileDurationMs = 2763; const int k640WebMFileDurationMs = 2763;
const int kOpusEndTrimmingWebMFileDurationMs = 2771; const int kOpusEndTrimmingWebMFileDurationMs = 2771;
const int kVP9WebMFileDurationMs = 2735; const int kVP9WebMFileDurationMs = 2703;
const int kVP8AWebMFileDurationMs = 2700; const int kVP8AWebMFileDurationMs = 2700;
#if defined(USE_PROPRIETARY_CODECS) #if defined(USE_PROPRIETARY_CODECS)
...@@ -517,11 +517,8 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) { ...@@ -517,11 +517,8 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
Stop(); Stop();
} }
// TODO(fgalligan): Enable after new vp9 files are landed. TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VP9_WebM) {
// http://crbug.com/259116 MockMediaSource source("bear-vp9.webm", kWebMVP9, 67504);
TEST_F(PipelineIntegrationTest,
DISABLED_BasicPlayback_MediaSource_VideoOnly_VP9_WebM) {
MockMediaSource source("bear-vp9.webm", kWebMVP9, 32393);
StartPipelineWithMediaSource(&source); StartPipelineWithMediaSource(&source);
source.EndOfStream(); source.EndOfStream();
...@@ -1072,9 +1069,7 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) { ...@@ -1072,9 +1069,7 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) {
} }
// Verify that VP9 video in WebM containers can be played back. // Verify that VP9 video in WebM containers can be played back.
// TODO(fgalligan): Enable after new vp9 files are landed. TEST_F(PipelineIntegrationTest, BasicPlayback_VideoOnly_VP9_WebM) {
// http://crbug.com/259116
TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VideoOnly_VP9_WebM) {
ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9.webm"), ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9.webm"),
PIPELINE_OK)); PIPELINE_OK));
Play(); Play();
...@@ -1083,9 +1078,7 @@ TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VideoOnly_VP9_WebM) { ...@@ -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 // Verify that VP9 video and Opus audio in the same WebM container can be played
// back. // back.
// TODO(fgalligan): Enable after new vp9 files are landed. TEST_F(PipelineIntegrationTest, BasicPlayback_VP9_Opus_WebM) {
// http://crbug.com/259116
TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) {
ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"), ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"),
PIPELINE_OK)); PIPELINE_OK));
Play(); Play();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment