WIP fixing/extending acolwell's init-segment-received patch

media/filters/chunk_demuxer.h

 // 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.
 
 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <deque>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/synchronization/lock.h"
 #include "media/base/byte_queue.h"
 #include "media/base/demuxer.h"
 #include "media/base/ranges.h"
 #include "media/base/stream_parser.h"
 #include "media/filters/source_buffer_stream.h"
 
 namespace media {
 
 class FFmpegURLProtocol;
 class SourceState;
 
+template <class ConfigType>
+class TrackInfo {
+ public:
+  TrackInfo(StreamParser::TrackId track_id, const ConfigType& config) :
+      track_id_(track_id),
+      config_(config) {
+  }
+
+  StreamParser::TrackId track_id() const { return track_id_; }
+  const ConfigType& config() const { return config_; }
+
+ private:
+  StreamParser::TrackId track_id_;
+  ConfigType config_;
+};
+
+typedef TrackInfo<AudioDecoderConfig> AudioTrackInfo;
+typedef TrackInfo<VideoDecoderConfig> VideoTrackInfo;
+typedef TrackInfo<TextTrackConfig> TextTrackInfo;
+
+struct InitSegment {
+  static InitSegment Create(
+      const AudioDecoderConfig& audio_config,
+      const VideoDecoderConfig& video_config,
+      const StreamParser::TextTrackConfigMap& text_configs);
+
+  ~InitSegment();
+
+  bool HasTracks() const;
+
+  const std::vector<AudioTrackInfo> audio_tracks;
+  const std::vector<VideoTrackInfo> video_tracks;
+  const std::vector<TextTrackInfo> text_tracks;
+
+ private:
+  InitSegment(const std::vector<AudioTrackInfo>& audio_tracks,
+              const std::vector<VideoTrackInfo>& video_tracks,
+              const std::vector<TextTrackInfo>& text_tracks);
+};
+
 class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
   explicit ChunkDemuxerStream(Type type, bool splice_frames_enabled);
   virtual ~ChunkDemuxerStream();
 
   // ChunkDemuxerStream control methods.
   void StartReturningData();
   void AbortReads();
@@ skipping 88 matching lines @@
   bool splice_frames_enabled_;
   bool partial_append_window_trimming_enabled_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
 };
 
 // Demuxer implementation that allows chunks of media data to be passed
 // from JavaScript to the media stack.
 class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
  public:
+  typedef base::Callback<void(const InitSegment&)> NewInitSegmentCB;
+
   enum Status {
     kOk,              // ID added w/o error.
     kNotSupported,    // Type specified is not supported.
     kReachedIdLimit,  // Reached ID limit. We can't handle any more IDs.
   };
 
   // |open_cb| Run when Initialize() is called to signal that the demuxer
   //   is ready to receive media data via AppenData().
   // |need_key_cb| Run when the demuxer determines that an encryption key is
   //   needed to decrypt the content.
@@ skipping 40 matching lines @@
   // StartWaitingForSeek() call. This method also arranges for the next Seek()
   // call received before a StartWaitingForSeek() call to immediately call its
   // callback without waiting for any data.
   // |seek_time| - The presentation timestamp for the seek request that
   // triggered this call. It represents the most recent position the caller is
   // trying to seek to.
   void CancelPendingSeek(base::TimeDelta seek_time);
 
   // Registers a new |id| to use for AppendData() calls. |type| indicates
   // the MIME type for the data that we intend to append for this ID.
+  // BIG TODO(wolenetz): document |new_init_segment_cb| once it's hooked up.
   // kOk is returned if the demuxer has enough resources to support another ID
   //    and supports the format indicated by |type|.
   // kNotSupported is returned if |type| is not a supported format.
   // kReachedIdLimit is returned if the demuxer cannot handle another ID right
   //    now.
   Status AddId(const std::string& id, const std::string& type,
-               std::vector<std::string>& codecs);
+               std::vector<std::string>& codecs,
+               const NewInitSegmentCB& new_init_segment_cb);
 
   // Removed an ID & associated resources that were previously added with
   // AddId().
   void RemoveId(const std::string& id);
 
   // Gets the currently buffered ranges for the specified ID.
   Ranges<base::TimeDelta> GetBufferedRanges(const std::string& id) const;
 
   // Appends media data to the source buffer associated with |id|, applying
   // and possibly updating |*timestamp_offset| during coded frame processing.
@@ skipping 174 matching lines @@
 
   // Indicates that splice frame generation is enabled.
   const bool splice_frames_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_