Render inband text tracks in the media pipeline

media/base/demuxer.h

Index: media/base/demuxer.h
diff --git a/media/base/demuxer.h b/media/base/demuxer.h
index 853a21a2a7557de19768dc430e19613560c52dee..7ccb6c7664407a23ba6e21b80eace958ede073c3 100644
--- a/media/base/demuxer.h
+++ b/media/base/demuxer.h
@@ -12,9 +12,12 @@
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
+#include "media/base/text_track.h"

[acolwell GONE FROM CHROMIUM, 2013/09/25 23:23:10]

nit: This doesn't appear to be needed.

[Matthew Heaney (Chromium), 2013/09/29 03:31:23]

It contains the declaration of media::TextKind, which is used the signature of
DemuxerHost::AddTextStream.

 
 namespace media {
 
+class DemuxerStream;

[acolwell GONE FROM CHROMIUM, 2013/09/25 23:23:10]

nit: This shouldn't be needed since demuxer_stream.h is being included above.

[Matthew Heaney (Chromium), 2013/09/29 03:31:23]

Done.

+
 class MEDIA_EXPORT DemuxerHost : public DataSourceHost {
  public:
   // Sets the duration of the media in microseconds.
@@ -25,6 +28,12 @@ class MEDIA_EXPORT DemuxerHost : public DataSourceHost {
   // method with PIPELINE_OK.
   virtual void OnDemuxerError(PipelineStatus error) = 0;
 
+  // Add |text_stream| to the collection managed by the text renderer.
+  virtual void AddTextStream(DemuxerStream* text_stream,
+                             TextKind kind,
+                             const std::string& label,
+                             const std::string& language) = 0;
+
  protected:
   virtual ~DemuxerHost();
 };
@@ -69,7 +78,8 @@ class MEDIA_EXPORT Demuxer {
   // TODO(scherkus): this might not be needed http://crbug.com/234708
   virtual void OnAudioRendererDisabled();
 
-  // Returns the given stream type, or NULL if that type is not present.
+  // Returns the first stream of the given stream type, or NULL if that type
+  // of stream is not present.
   virtual DemuxerStream* GetStream(DemuxerStream::Type type) = 0;
 
   // Returns the starting time for the media file.