Render inband text tracks in the media pipeline

content/renderer/media/webmediaplayer_impl.h

Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index 270186bbbe5aad43fce9d7c4d3ee8a7c4977fab2..6d5ef08703c0815db0b7565317c21953c4513a62 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -20,6 +20,7 @@
 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
+#include <map>

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

nit: no longer needed.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

 #include <string>
 #include <vector>
 
@@ -55,9 +56,10 @@ class MessageLoopProxy;
 
 namespace media {
 class ChunkDemuxer;
-class FFmpegDemuxer;
+class DemuxerStream;
 class GpuVideoAcceleratorFactories;
 class MediaLog;
+class TextCue;

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

nit: Not needed

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

 }
 
 namespace webkit {
@@ -197,9 +199,19 @@ class WebMediaPlayerImpl
   void OnNeedKey(const std::string& type,
                  const std::string& session_id,
                  const std::vector<uint8>& init_data);
+  // TODO(matthewjheaney): Once we're satisfied that we have the threading model
+  // correct for handling text cues, move the media source from OnTextTrack over
+  // to AddTextStream.

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

I'd like this fixed in this CL. Now that OnAddTextStream provides a TextTrack, I
think this should be pretty straight forward.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

I modified the chunk demuxer and friends to handle the new schema.  I'm a little
fuzzy still about sources and source ids (you obviously know the Media Source
API way better than I do), so there's a bit of chunk demuxer stream cleanup that
needs to be added, but otherwise it's working.

   scoped_ptr<media::TextTrack> OnTextTrack(media::TextKind kind,
                                            const std::string& label,
                                            const std::string& language);
+
+  void OnAddTextStream(media::DemuxerStream*,
+                       media::TextKind kind,
+                       const std::string& label,
+                       const std::string& language,
+                       const media::AddTextTrackDoneCB& done_cb);
+
   void SetOpaque(bool);
 
  private: