Move key frame flag from StreamParserBuffer to DecoderBuffer

media/base/decoder_buffer.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/base/decoder_buffer.h"
 
 #include "base/logging.h"
 #include "media/base/buffers.h"
 #include "media/base/decrypt_config.h"
 
 namespace media {
 
 DecoderBuffer::DecoderBuffer(int size)
     : size_(size),
-      side_data_size_(0) {
+      side_data_size_(0),
+      is_keyframe_(false) {
   Initialize();
 }
 
 DecoderBuffer::DecoderBuffer(const uint8* data, int size,
-                             const uint8* side_data, int side_data_size)
+                             const uint8* side_data, int side_data_size,
+                             bool is_keyframe)
     : size_(size),
-      side_data_size_(side_data_size) {
+      side_data_size_(side_data_size),
+      is_keyframe_(is_keyframe) {
   if (!data) {
     CHECK_EQ(size_, 0);
     CHECK(!side_data);
     return;
   }
 
   Initialize();
   memcpy(data_.get(), data, size_);
   if (side_data)
     memcpy(side_data_.get(), side_data, side_data_size_);
 }
 
 DecoderBuffer::~DecoderBuffer() {}
 
 void DecoderBuffer::Initialize() {
   CHECK_GE(size_, 0);
   data_.reset(reinterpret_cast<uint8*>(
       base::AlignedAlloc(size_ + kPaddingSize, kAlignmentSize)));
   memset(data_.get() + size_, 0, kPaddingSize);
   if (side_data_size_ > 0) {
     side_data_.reset(reinterpret_cast<uint8*>(
         base::AlignedAlloc(side_data_size_ + kPaddingSize, kAlignmentSize)));
     memset(side_data_.get() + side_data_size_, 0, kPaddingSize);
   }
   splice_timestamp_ = kNoTimestamp();
 }
 
 // static
 scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
-                                                     int data_size) {
+                                                     int data_size,
+                                                     bool is_keyframe) {
   // If you hit this CHECK you likely have a bug in a demuxer. Go fix it.
   CHECK(data);
-  return make_scoped_refptr(new DecoderBuffer(data, data_size, NULL, 0));
+  return make_scoped_refptr(new DecoderBuffer(data, data_size, NULL, 0,
+                                              is_keyframe));
 }
 
 // static
 scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
                                                      int data_size,
                                                      const uint8* side_data,
-                                                     int side_data_size) {
+                                                     int side_data_size,
+                                                     bool is_keyframe) {
   // If you hit this CHECK you likely have a bug in a demuxer. Go fix it.
   CHECK(data);
   CHECK(side_data);
   return make_scoped_refptr(new DecoderBuffer(data, data_size,
-                                              side_data, side_data_size));
+                                              side_data, side_data_size,
+                                              is_keyframe));
 }
 
 // static
 scoped_refptr<DecoderBuffer> DecoderBuffer::CreateEOSBuffer() {
-  return make_scoped_refptr(new DecoderBuffer(NULL, 0, NULL, 0));
+  return make_scoped_refptr(new DecoderBuffer(NULL, 0, NULL, 0, false));
 }
 
 std::string DecoderBuffer::AsHumanReadableString() {
   if (end_of_stream()) {
     return "end of stream";
   }
 
   std::ostringstream s;
   s << "timestamp: " << timestamp_.InMicroseconds()
     << " duration: " << duration_.InMicroseconds()
     << " size: " << size_
     << " side_data_size: " << side_data_size_
+    << " is_keyframe: " << is_keyframe_
     << " encrypted: " << (decrypt_config_ != NULL)
     << " discard_padding (ms): (" << discard_padding_.first.InMilliseconds()
     << ", " << discard_padding_.second.InMilliseconds() << ")";
   return s.str();
 }
 
 void DecoderBuffer::set_timestamp(base::TimeDelta timestamp) {
   DCHECK(!end_of_stream());
   timestamp_ = timestamp;
 }
 
 }  // namespace media