Media Source dispatches inband text tracks

media/filters/chunk_demuxer.h

Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index f2b5062fff82388e9a7e8d806bd2b50f5a0f326d..0759ca40f6480563007373372dc813240451d70b 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -36,6 +36,11 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
                               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
@@ -43,6 +48,11 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   // |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.
@@ -139,6 +149,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   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);
@@ -178,6 +189,8 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   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_;