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

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: fix compile errors 11/21 #6 Created 7 years, 1 month 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
« no previous file with comments | « media/filters/pipeline_integration_test.cc ('k') | media/filters/source_buffer_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/source_buffer_stream.h
diff --git a/media/filters/source_buffer_stream.h b/media/filters/source_buffer_stream.h
index e0848af4980bb7ac69207e0a36318153a75b925a..4b00504cfb2d2a98a52ad37006c14eea8d921721 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.
@@ -307,6 +311,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_;
« no previous file with comments | « media/filters/pipeline_integration_test.cc ('k') | media/filters/source_buffer_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698