MSE: Add StreamParser buffer remuxing utility and tests

media/formats/webm/webm_cluster_parser.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
+#include "media/base/stream_parser.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/formats/webm/webm_parser.h"
 #include "media/formats/webm/webm_tracks_parser.h"
 
 namespace media {
 
 class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
+ public:
+  typedef StreamParser::TrackId TrackId;
+
  private:
   // Helper class that manages per-track state.
   class Track {
    public:
     Track(int track_num, bool is_video);
     ~Track();
 
     int track_num() const { return track_num_; }
     const std::deque<scoped_refptr<StreamParserBuffer> >& buffers() const {
       return buffers_;
@@ skipping 13 matching lines @@
    private:
     int track_num_;
     std::deque<scoped_refptr<StreamParserBuffer> > buffers_;
     bool is_video_;
   };
 
   typedef std::map<int, Track> TextTrackMap;
 
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
-  typedef std::map<int, const BufferQueue> TextBufferQueueMap;
+  typedef std::map<TrackId, const BufferQueue> TextBufferQueueMap;
 
   WebMClusterParser(int64 timecode_scale,
                     int audio_track_num,
                     int video_track_num,
                     const WebMTracksParser::TextTracks& text_tracks,
                     const std::set<int64>& ignored_tracks,
                     const std::string& audio_encryption_key_id,
                     const std::string& video_encryption_key_id,
                     const LogCB& log_cb);
   virtual ~WebMClusterParser();
@@ skipping 75 matching lines @@
   TextBufferQueueMap text_buffers_map_;
 
   LogCB log_cb_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_