Add is_encrypted() in VideoDecoderConfig.

media/filters/source_buffer_stream_unittest.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/source_buffer_stream.h"
 
+#include <string>
+
 #include "base/logging.h"
 #include "media/base/data_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 static const int kDefaultFramesPerSecond = 30;
 static const int kDefaultKeyframesPerSecond = 6;
 static const uint8 kDataA = 0x11;
 static const uint8 kDataB = 0x33;
 static const int kDataSize = 1;
 static const gfx::Size kCodedSize(320, 240);
 
 class SourceBufferStreamTest : public testing::Test {
  protected:
   SourceBufferStreamTest() {
     config_.Initialize(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
                        VideoFrame::YV12, kCodedSize, gfx::Rect(kCodedSize),
-                       kCodedSize, NULL, 0, false);
+                       kCodedSize, NULL, 0, false, false);
     stream_.reset(new SourceBufferStream(config_));
     SetStreamInfo(kDefaultFramesPerSecond, kDefaultKeyframesPerSecond);
   }
 
   void SetMemoryLimit(int buffers_of_data) {
     stream_->set_memory_limit(buffers_of_data * kDataSize);
   }
 
   void SetStreamInfo(int frames_per_second, int keyframes_per_second) {
     frames_per_second_ = frames_per_second;
@@ skipping 1794 matching lines @@
   // Fulfill the seek by appending one buffer at 15.
   NewSegmentAppend(15, 1, &kDataA);
   CheckExpectedBuffers(15, 15, &kDataA);
   CheckExpectedRanges("{ [15,15) [20,28) }");
 }
 
 TEST_F(SourceBufferStreamTest, ConfigChange_Basic) {
   gfx::Size kNewCodedSize(kCodedSize.width() * 2, kCodedSize.height() * 2);
   VideoDecoderConfig new_config(
       kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, VideoFrame::YV12, kNewCodedSize,
-      gfx::Rect(kNewCodedSize), kNewCodedSize, NULL, 0);
+      gfx::Rect(kNewCodedSize), kNewCodedSize, NULL, false, false);

[acolwell GONE FROM CHROMIUM, 2012/09/17 17:41:17]

Should be 0, false

[xhwang, 2012/09/17 19:42:25]

Done.

   ASSERT_FALSE(new_config.Matches(config_));
 
   Seek(0);
   CheckConfig(config_);
 
   // Append 5 buffers at positions 0 through 4
   NewSegmentAppend(0, 5, &kDataA);
 
   CheckConfig(config_);
 
@@ skipping 26 matching lines @@
     CheckConfig(new_config);
     EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
   }
 }
 
 TEST_F(SourceBufferStreamTest, ConfigChange_Seek) {
   scoped_refptr<StreamParserBuffer> buffer;
   gfx::Size kNewCodedSize(kCodedSize.width() * 2, kCodedSize.height() * 2);
   VideoDecoderConfig new_config(
       kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, VideoFrame::YV12, kNewCodedSize,
-      gfx::Rect(kNewCodedSize), kNewCodedSize, NULL, 0);
+      gfx::Rect(kNewCodedSize), kNewCodedSize, NULL, false, false);

[acolwell GONE FROM CHROMIUM, 2012/09/17 17:41:17]

Should be 0, false

[xhwang, 2012/09/17 19:42:25]

Done.

 
   Seek(0);
   NewSegmentAppend(0, 5, &kDataA);
   stream_->UpdateVideoConfig(new_config);
   NewSegmentAppend(5, 5, &kDataB);
 
   // Seek to the start of the buffers with the new config and make sure a
   // config change is signalled.
   CheckConfig(config_);
   Seek(5);
@@ skipping 145 matching lines @@
   CheckExpectedRanges("{ [0,4) [10,10) }");
 }
 
 // TODO(vrk): Add unit tests where keyframes are unaligned between streams.
 // (crbug.com/133557)
 
 // TODO(vrk): Add unit tests with end of stream being called at interesting
 // times.
 
 }  // namespace media