MSE: Add StreamParser buffer remuxing utility and tests

media/filters/chunk_demuxer.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/chunk_demuxer.h"
 
 #include <algorithm>
 #include <deque>
 #include <limits>
 #include <list>
@@ skipping 172 matching lines @@
   // with the track numbers in |text_map|.
   // Returns true on a successful call. Returns false if an error occurred while
   // processing the buffers.
   bool OnNewBuffers(const StreamParser::BufferQueue& audio_buffers,
                     const StreamParser::BufferQueue& video_buffers,
                     const StreamParser::TextBufferQueueMap& text_map);
 
   // Helper function for OnNewBuffers() when new text buffers have been parsed.
   // It applies |timestamp_offset_| to all buffers in |buffers| and then appends
   // the (modified) buffers to the demuxer stream associated with
-  // the track having |text_track_number|.
+  // the track having |text_track_id|.
   // Returns true on a successful call. Returns false if an error occurred while
   // processing the buffers.
-  bool OnTextBuffers(int text_track_number,
+  bool OnTextBuffers(StreamParser::TrackId text_track_id,
                      const StreamParser::BufferQueue& buffers);
 
   // Helper function that appends |buffers| to |stream| and calls
   // |increase_duration_cb_| to potentially update the duration.
   // Returns true if the append was successful. Returns false if
   // |stream| is NULL or something in |buffers| caused the append to fail.
   bool AppendAndUpdateDuration(ChunkDemuxerStream* stream,
                                const StreamParser::BufferQueue& buffers);
 
   // Helper function that adds |timestamp_offset_| to each buffer in |buffers|.
@@ skipping 41 matching lines @@
 
   // The object used to parse appended data.
   scoped_ptr<StreamParser> stream_parser_;
 
   ChunkDemuxerStream* audio_;
   bool audio_needs_keyframe_;
 
   ChunkDemuxerStream* video_;
   bool video_needs_keyframe_;
 
-  typedef std::map<int, ChunkDemuxerStream*> TextStreamMap;
+  typedef std::map<StreamParser::TrackId, ChunkDemuxerStream*> TextStreamMap;
   TextStreamMap text_stream_map_;
 
   LogCB log_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceState);
 };
 
 class ChunkDemuxerStream : public DemuxerStream {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
@@ skipping 497 matching lines @@
   new_media_segment_ = false;
 }
 
 bool SourceState::OnNewBuffers(
     const StreamParser::BufferQueue& audio_buffers,
     const StreamParser::BufferQueue& video_buffers,
     const StreamParser::TextBufferQueueMap& text_map) {
   DCHECK(!audio_buffers.empty() || !video_buffers.empty() ||
          !text_map.empty());
 
+  // TODO(wolenetz): DCHECK + return false if any of these buffers have UNKNOWN
+  // type() in upcoming coded frame processing compliant implementation. See
+  // http://crbug.com/249422.
+
   AdjustBufferTimestamps(audio_buffers);
   AdjustBufferTimestamps(video_buffers);
 
   StreamParser::BufferQueue filtered_audio;
   StreamParser::BufferQueue filtered_video;
 
   FilterWithAppendWindow(audio_buffers, &audio_needs_keyframe_,
                          &filtered_audio);
 
   FilterWithAppendWindow(video_buffers, &video_needs_keyframe_,
@@ skipping 52 matching lines @@
       if (!OnTextBuffers(itr->first, text_buffers))
         return false;
     }
   }
 
   DCHECK(!all_text_buffers_empty);
   return true;
 }
 
 bool SourceState::OnTextBuffers(
-    int text_track_number,
+    StreamParser::TrackId text_track_id,
     const StreamParser::BufferQueue& buffers) {
   DCHECK(!buffers.empty());
 
-  TextStreamMap::iterator itr = text_stream_map_.find(text_track_number);
+  TextStreamMap::iterator itr = text_stream_map_.find(text_track_id);
   if (itr == text_stream_map_.end())
     return false;
 
   AdjustBufferTimestamps(buffers);
 
   StreamParser::BufferQueue filtered_buffers;
   bool needs_keyframe = false;
   FilterWithAppendWindow(buffers, &needs_keyframe, &filtered_buffers);
 
   if (filtered_buffers.empty())
@@ skipping 998 matching lines @@
 }
 
 void ChunkDemuxer::ShutdownAllStreams() {
   for (SourceStateMap::iterator itr = source_state_map_.begin();
        itr != source_state_map_.end(); ++itr) {
     itr->second->Shutdown();
   }
 }
 
 }  // namespace media