Index: media/base/demuxer.h |
diff --git a/media/base/demuxer.h b/media/base/demuxer.h |
index a2dad22d67cb28c6085bef3353443693b0ab08e6..b7224377ba4a0b72532f06e1cecf8ab0cefd64de 100644 |
--- a/media/base/demuxer.h |
+++ b/media/base/demuxer.h |
@@ -12,6 +12,7 @@ |
#include "media/base/demuxer_stream.h" |
#include "media/base/media_export.h" |
#include "media/base/pipeline_status.h" |
+#include "media/base/text_track.h" |
namespace media { |
@@ -25,6 +26,15 @@ 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, |
acolwell GONE FROM CHROMIUM
2013/10/21 20:10:40
nit: Use const TextTrackConfig& here instead of th
Matthew Heaney (Chromium)
2013/10/23 05:09:01
Done.
|
+ const std::string& label, |
+ const std::string& language) = 0; |
+ |
+ // Remove |text_stream| from the presentation. |
+ virtual void RemoveTextStream(DemuxerStream* text_stream) = 0; |
+ |
protected: |
virtual ~DemuxerHost(); |
}; |
@@ -66,7 +76,8 @@ class MEDIA_EXPORT Demuxer { |
// TODO(scherkus): this might not be needed http://crbug.com/234708 |
virtual void OnAudioRendererDisabled() = 0; |
- // Returns the given stream type, or NULL if that type is not present. |
+ // Returns the first stream of the given stream type (which is not allowed |
+ // to be DemuxerStream::TEXT), 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. |