media: Support VP9 in media source.

media/filters/pipeline_integration_test.cc

Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index cd574ca5f1191c58f797d613e82e0d86dfd9fdf8..9675f667eb4ba6ac4d0de4de56bd01f7cb5ed4c0 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -21,6 +21,7 @@ static const char kClearKeySystem[] = "org.w3.clearkey";
 static const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 };
 
 static const char kWebM[] = "video/webm; codecs=\"vp8,vorbis\"";
+static const char kWebMVp9[] = "video/webm; codecs=\"vp9\"";

[Tom Finegan, 2013/04/04 22:09:57]

Should I use VP9 here (to be consistent with test names), Vp9 in both places, or
leave this as-is?

[acolwell GONE FROM CHROMIUM, 2013/04/04 22:49:28]

I'd prefer VP9 here and below. I feel it's equivalant to MP4 below.

[Tom Finegan, 2013/04/05 03:35:06]

Done.

 static const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\"";
 static const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\"";
 static const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\"";
@@ -51,6 +52,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;

[Tom Finegan, 2013/04/04 22:09:57]

Ditto.

[Tom Finegan, 2013/04/05 03:35:06]

Done.

 
 // Note: Tests using this class only exercise the DecryptingDemuxerStream path.
 // They do not exercise the Decrypting{Audio|Video}Decoder path.
@@ -455,6 +457,27 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
   Stop();
 }
 
+// TODO(tomfinegan): Enable this test when the VP9 bitstream is finalized.

[Tom Finegan, 2013/04/04 22:09:57]

This is really about crbug.com/173333

Should I update the comment, or is this fine?

[acolwell GONE FROM CHROMIUM, 2013/04/04 22:49:28]

Please update the comment to point to the bug.

[Tom Finegan, 2013/04/05 03:35:06]

Done.

+TEST_F(PipelineIntegrationTest,
+       DISABLED_BasicPlayback_MediaSource_VideoOnly_VP9_WebM) {
+  MockMediaSource source("bear-vp9.webm", kWebMVp9, 19324);
+  StartPipelineWithMediaSource(&source);
+  source.EndOfStream();
+
+  EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
+  EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
+  EXPECT_EQ(kVp9WebMFileDurationMs,
+            pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
+
+  Play();
+
+  ASSERT_TRUE(WaitUntilOnEnded());
+  source.Abort();
+  Stop();
+}
+
+
+
 TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
   MockMediaSource source("bear-320x240-16x9-aspect.webm", kWebM,
                          kAppendWholeFile);