Chromium Code Reviews

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: modified ffmpeg demuxer unittest Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: media/filters/source_buffer_stream.h
diff --git a/media/filters/source_buffer_stream.h b/media/filters/source_buffer_stream.h
index f543471c80785890ca28302bb22907a1e00cacfd..4ef216888a881f7ec630f51aa316535f5f96617e 100644
--- a/media/filters/source_buffer_stream.h
+++ b/media/filters/source_buffer_stream.h
@@ -22,6 +22,7 @@
#include "media/base/media_log.h"
#include "media/base/ranges.h"
#include "media/base/stream_parser_buffer.h"
+#include "media/base/text_track_config.h"
#include "media/base/video_decoder_config.h"
namespace media {
@@ -49,6 +50,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 +110,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.
@@ -322,6 +326,9 @@ class MEDIA_EXPORT SourceBufferStream {
std::vector<AudioDecoderConfig> audio_configs_;
std::vector<VideoDecoderConfig> video_configs_;
+ // Holds the text config for this stream.
+ 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