Media Source dispatches inband text tracks

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 <map>
 #include <string>
 #include <utility>
@@ skipping 18 matching lines @@
   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.
   };
 
   typedef base::Callback<void(const std::string& type,
                               scoped_array<uint8> init_data,
                               int init_data_size)> NeedKeyCB;
 
+  // TODO(matthewjheaney): temp hack to test cue rendering.  We must
+  // either remove the callback entirely, or keep it but add the
+  // actual cue payload.
+  typedef base::Callback<void(const base::TimeDelta& time)> TextCB;
+
   // |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.
   // |log_cb| Run when parsing error messages need to be logged to the error
   //   console.
   ChunkDemuxer(const base::Closure& open_cb, const NeedKeyCB& need_key_cb,
+               const TextTrackCB& text_track_cb,
+               // TODO(matthewjheaney): TextCB is temp hack to test
+               // cue rendering.  We must either remove the callback
+               // entirely, or keep it but add the actual cue payload.
+               const TextCB& text_cb,

[acolwell GONE FROM CHROMIUM, 2013/04/05 16:29:23]

I think this should be removed and the NewTextTrackCB provides the way to route
cues to the proper location.

[Matthew Heaney (Chromium), 2013/05/09 03:53:11]

I changed this per your sketch of the mechanism.  See if the changes are what
you had in mind.

                const LogCB& log_cb);
 
   // Demuxer implementation.
   virtual void Initialize(DemuxerHost* host,
                           const PipelineStatusCB& cb) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time, const PipelineStatusCB&  cb) OVERRIDE;
   virtual void OnAudioRendererDisabled() OVERRIDE;
   virtual scoped_refptr<DemuxerStream> GetStream(
       DemuxerStream::Type type) OVERRIDE;
@@ skipping 76 matching lines @@
   // StreamParser callbacks.
   void OnStreamParserInitDone(bool success, base::TimeDelta duration);
   bool OnNewConfigs(bool has_audio, bool has_video,
                     const AudioDecoderConfig& audio_config,
                     const VideoDecoderConfig& video_config);
   bool OnAudioBuffers(const StreamParser::BufferQueue& buffers);
   bool OnVideoBuffers(const StreamParser::BufferQueue& buffers);
   bool OnNeedKey(const std::string& type,
                  scoped_array<uint8> init_data,
                  int init_data_size);
+  bool OnTextBuffers(const StreamParser::BufferQueue& buffers);
   void OnNewMediaSegment(const std::string& source_id,
                          base::TimeDelta start_timestamp);
   void OnEndOfMediaSegment(const std::string& source_id);
 
   // Computes the intersection between the video & audio
   // buffered ranges.
   Ranges<base::TimeDelta> ComputeIntersection() const;
 
   // Applies |time_offset| to the timestamps of |buffers|.
   void AdjustBufferTimestamps(const StreamParser::BufferQueue& buffers,
@@ skipping 19 matching lines @@
 
   // Returns the ranges representing the buffered data in the demuxer.
   Ranges<base::TimeDelta> GetBufferedRanges() const;
 
   mutable base::Lock lock_;
   State state_;
 
   DemuxerHost* host_;
   base::Closure open_cb_;
   NeedKeyCB need_key_cb_;
+  TextTrackCB text_track_cb_;
+  TextCB text_cb_;  // TODO(matthewjheaney): temp hack to test cue rendering
   // Callback used to report error strings that can help the web developer
   // figure out what is wrong with the content.
   LogCB log_cb_;
 
   PipelineStatusCB init_cb_;
   PipelineStatusCB seek_cb_;
 
   scoped_refptr<ChunkDemuxerStream> audio_;
   scoped_refptr<ChunkDemuxerStream> video_;
 
@@ skipping 22 matching lines @@
   // removed with RemoveID() but can not be re-added (yet).
   std::string source_id_audio_;
   std::string source_id_video_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_