Move key frame flag from StreamParserBuffer to DecoderBuffer

media/base/decoder_buffer_unittest.cc

Index: media/base/decoder_buffer_unittest.cc
diff --git a/media/base/decoder_buffer_unittest.cc b/media/base/decoder_buffer_unittest.cc
index c5a03b78450e0f4f7ab9eee029c6acb0f2619dee..fc738417516b1480047339b0045a92028879e931 100644
--- a/media/base/decoder_buffer_unittest.cc
+++ b/media/base/decoder_buffer_unittest.cc
@@ -13,6 +13,7 @@ TEST(DecoderBufferTest, Constructors) {
   EXPECT_TRUE(buffer->data());
   EXPECT_EQ(0, buffer->data_size());
   EXPECT_FALSE(buffer->end_of_stream());
+  EXPECT_FALSE(buffer->is_keyframe());
 
   const int kTestSize = 10;
   scoped_refptr<DecoderBuffer> buffer3(new DecoderBuffer(kTestSize));
@@ -28,16 +29,29 @@ TEST(DecoderBufferTest, CreateEOSBuffer) {
 TEST(DecoderBufferTest, CopyFrom) {
   const uint8 kData[] = "hello";
   const int kDataSize = arraysize(kData);
+
+  scoped_refptr<DecoderBuffer> buffer1(DecoderBuffer::CopyFrom(
+      reinterpret_cast<const uint8*>(&kData), kDataSize, false));
+  ASSERT_TRUE(buffer1.get());
+  EXPECT_NE(kData, buffer1->data());
+  EXPECT_EQ(buffer1->data_size(), kDataSize);
+  EXPECT_EQ(0, memcmp(buffer1->data(), kData, kDataSize));
+  EXPECT_FALSE(buffer1->end_of_stream());
+  EXPECT_FALSE(buffer1->is_keyframe());
+
   scoped_refptr<DecoderBuffer> buffer2(DecoderBuffer::CopyFrom(
-      reinterpret_cast<const uint8*>(&kData), kDataSize));
+      reinterpret_cast<const uint8*>(&kData), kDataSize, true));
   ASSERT_TRUE(buffer2.get());
   EXPECT_NE(kData, buffer2->data());
   EXPECT_EQ(buffer2->data_size(), kDataSize);
   EXPECT_EQ(0, memcmp(buffer2->data(), kData, kDataSize));
   EXPECT_FALSE(buffer2->end_of_stream());
+  EXPECT_TRUE(buffer2->is_keyframe());
+
   scoped_refptr<DecoderBuffer> buffer3(DecoderBuffer::CopyFrom(
       reinterpret_cast<const uint8*>(&kData), kDataSize,
-      reinterpret_cast<const uint8*>(&kData), kDataSize));
+      reinterpret_cast<const uint8*>(&kData), kDataSize,
+      false));
   ASSERT_TRUE(buffer3.get());
   EXPECT_NE(kData, buffer3->data());
   EXPECT_EQ(buffer3->data_size(), kDataSize);
@@ -46,6 +60,21 @@ TEST(DecoderBufferTest, CopyFrom) {
   EXPECT_EQ(buffer3->side_data_size(), kDataSize);
   EXPECT_EQ(0, memcmp(buffer3->side_data(), kData, kDataSize));
   EXPECT_FALSE(buffer3->end_of_stream());
+  EXPECT_FALSE(buffer3->is_keyframe());
+
+  scoped_refptr<DecoderBuffer> buffer4(DecoderBuffer::CopyFrom(
+      reinterpret_cast<const uint8*>(&kData), kDataSize,
+      reinterpret_cast<const uint8*>(&kData), kDataSize,
+      true));
+  ASSERT_TRUE(buffer4.get());
+  EXPECT_NE(kData, buffer4->data());
+  EXPECT_EQ(buffer4->data_size(), kDataSize);
+  EXPECT_EQ(0, memcmp(buffer4->data(), kData, kDataSize));
+  EXPECT_NE(kData, buffer4->side_data());
+  EXPECT_EQ(buffer4->side_data_size(), kDataSize);
+  EXPECT_EQ(0, memcmp(buffer4->side_data(), kData, kDataSize));
+  EXPECT_FALSE(buffer4->end_of_stream());
+  EXPECT_TRUE(buffer4->is_keyframe());
 }
 
 #if !defined(OS_ANDROID)
@@ -53,7 +82,7 @@ TEST(DecoderBufferTest, PaddingAlignment) {
   const uint8 kData[] = "hello";
   const int kDataSize = arraysize(kData);
   scoped_refptr<DecoderBuffer> buffer2(DecoderBuffer::CopyFrom(
-      reinterpret_cast<const uint8*>(&kData), kDataSize));
+      reinterpret_cast<const uint8*>(&kData), kDataSize, false));
   ASSERT_TRUE(buffer2.get());
 
   // Padding data should always be zeroed.
@@ -72,6 +101,8 @@ TEST(DecoderBufferTest, PaddingAlignment) {
 
   EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(
       buffer2->data()) & (DecoderBuffer::kAlignmentSize - 1));
+
+  EXPECT_FALSE(buffer2->is_keyframe());
 }
 #endif