MSE: Add StreamParser buffer remuxing utility and tests

media/base/stream_parser_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/stream_parser_buffer.h"
 
 #include "base/logging.h"
 #include "media/base/buffers.h"
 
 namespace media {
 
 static bool HasNestedFadeOutPreroll(
     const std::vector<scoped_refptr<StreamParserBuffer> >& fade_out_preroll) {
   for (size_t i = 0; i < fade_out_preroll.size(); ++i) {
     if (!fade_out_preroll[i]->GetFadeOutPreroll().empty())
       return true;
   }
   return false;
 }
 
 scoped_refptr<StreamParserBuffer> StreamParserBuffer::CreateEOSBuffer() {
-  return make_scoped_refptr(new StreamParserBuffer(NULL, 0, NULL, 0, false));
+  return make_scoped_refptr(new StreamParserBuffer(NULL, 0, NULL, 0, false,
+                                                   kAudio /* meaningless */));

[xhwang, 2014/01/29 08:04:50]

see above about the possibility of using UNKNOWN for EOS buffer.

[wolenetz, 2014/02/05 02:49:53]

Done.

 }
 
 scoped_refptr<StreamParserBuffer> StreamParserBuffer::CopyFrom(
-    const uint8* data, int data_size, bool is_keyframe) {
+    const uint8* data, int data_size, bool is_keyframe, Type type) {
   return make_scoped_refptr(
-      new StreamParserBuffer(data, data_size, NULL, 0, is_keyframe));
+      new StreamParserBuffer(data, data_size, NULL, 0, is_keyframe, type));
 }
 
 scoped_refptr<StreamParserBuffer> StreamParserBuffer::CopyFrom(
     const uint8* data, int data_size,
-    const uint8* side_data, int side_data_size, bool is_keyframe) {
+    const uint8* side_data, int side_data_size, bool is_keyframe, Type type) {
   return make_scoped_refptr(
       new StreamParserBuffer(data, data_size, side_data, side_data_size,
-                             is_keyframe));
+                             is_keyframe, type));
 }
 
 base::TimeDelta StreamParserBuffer::GetDecodeTimestamp() const {
   if (decode_timestamp_ == kNoTimestamp())
     return timestamp();
   return decode_timestamp_;
 }
 
 void StreamParserBuffer::SetDecodeTimestamp(const base::TimeDelta& timestamp) {
   decode_timestamp_ = timestamp;
 }
 
 StreamParserBuffer::StreamParserBuffer(const uint8* data, int data_size,
                                        const uint8* side_data,
-                                       int side_data_size, bool is_keyframe)
+                                       int side_data_size, bool is_keyframe,
+                                       Type type)
     : DecoderBuffer(data, data_size, side_data, side_data_size),
       is_keyframe_(is_keyframe),
       decode_timestamp_(kNoTimestamp()),
-      config_id_(kInvalidConfigId) {
+      config_id_(kInvalidConfigId),
+      type_(type),
+      text_track_number_(-1) {
   // TODO(scherkus): Should DataBuffer constructor accept a timestamp and
   // duration to force clients to set them? Today they end up being zero which
   // is both a common and valid value and could lead to bugs.
   if (data) {
     set_duration(kNoTimestamp());
   }
 }
 
 StreamParserBuffer::~StreamParserBuffer() {
 }
@@ skipping 11 matching lines @@
   return fade_out_preroll_;
 }
 
 void StreamParserBuffer::SetFadeOutPreroll(
     const std::vector<scoped_refptr<StreamParserBuffer> >& fade_out_preroll) {
   DCHECK(!HasNestedFadeOutPreroll(fade_out_preroll));
   fade_out_preroll_ = fade_out_preroll;
 }
 
 }  // namespace media