media: Support VP9 in media source.

media/filters/pipeline_integration_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/test_data_util.h"
 #include "media/crypto/aes_decryptor.h"
 
 using testing::AtMost;
 
 namespace media {
 
 static const char kSourceId[] = "SourceId";
 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\"";
 static const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\"";
 static const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\"";
 static const char kMP4AudioType[] = "audio/mp4";
 static const char kMP4VideoType[] = "video/mp4";
 
 // Key used to encrypt test files.
 static const uint8 kSecretKey[] = {
@@ skipping 10 matching lines @@
 static const int kAppendWholeFile = -1;
 
 // Constants for the Media Source config change tests.
 static const int kAppendTimeSec = 1;
 static const int kAppendTimeMs = kAppendTimeSec * 1000;
 static const int k320WebMFileDurationMs = 2737;
 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.
 class FakeEncryptedMedia {
  public:
   // Defines the behavior of the "app" that responds to EME events.
   class AppBase {
    public:
     virtual ~AppBase() {}
 
@@ skipping 384 matching lines @@
   EXPECT_EQ(k320WebMFileDurationMs,
             pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
 
   Play();
 
   ASSERT_TRUE(WaitUntilOnEnded());
   source.Abort();
   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);
   StartPipelineWithMediaSource(&source);
 
   scoped_refptr<DecoderBuffer> second_file =
       ReadTestDataFile("bear-640x360.webm");
 
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->GetData(), second_file->GetDataSize());
@@ skipping 424 matching lines @@
 // back.
 // Disabled since it might crash or corrupt heap, see http://crbug.com/173333
 TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) {
   ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"),
                     PIPELINE_OK));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
 }  // namespace media