Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(886)

Unified Diff: media/filters/source_buffer_stream.h

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: incorporate aaron's comments (10/16) Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/source_buffer_stream.h
diff --git a/media/filters/source_buffer_stream.h b/media/filters/source_buffer_stream.h
index b218b312cfa2e300d6dadd90241eb50a36e49018..063038f259edcf3fd750a52cdc83ec89f84dbfea 100644
--- a/media/filters/source_buffer_stream.h
+++ b/media/filters/source_buffer_stream.h
@@ -49,6 +49,8 @@ class MEDIA_EXPORT SourceBufferStream {
const LogCB& log_cb);
SourceBufferStream(const VideoDecoderConfig& video_config,
const LogCB& log_cb);
+ SourceBufferStream(const TextTrackConfig& text_config,
+ const LogCB& log_cb);
~SourceBufferStream();
@@ -107,6 +109,7 @@ class MEDIA_EXPORT SourceBufferStream {
const AudioDecoderConfig& GetCurrentAudioDecoderConfig();
const VideoDecoderConfig& GetCurrentVideoDecoderConfig();
+ const TextTrackConfig& GetCurrentTextTrackConfig();
// Notifies this object that the audio config has changed and buffers in
// future Append() calls should be associated with this new config.
@@ -314,6 +317,9 @@ class MEDIA_EXPORT SourceBufferStream {
std::vector<AudioDecoderConfig> audio_configs_;
std::vector<VideoDecoderConfig> video_configs_;
+ // TODO(matthewjheaney): does this need to be a vector?
acolwell GONE FROM CHROMIUM 2013/10/21 20:10:40 no. since we don't allow config changes on text tr
Matthew Heaney (Chromium) 2013/10/23 05:09:01 Done.
+ TextTrackConfig text_track_config_;
+
// True if more data needs to be appended before the Seek() can complete,
// false if no Seek() has been requested or the Seek() is completed.
bool seek_pending_;

Powered by Google App Engine
This is Rietveld 408576698