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

Unified Diff: media/mp2t/mp2t_stream_parser.cc

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/mp2t/mp2t_stream_parser.cc
diff --git a/media/mp2t/mp2t_stream_parser.cc b/media/mp2t/mp2t_stream_parser.cc
index 68fca5cedd26374fcd70bebcdd52f92a7b460ec8..9c403ebc99be398fe099d888129c1ec539a59734 100644
--- a/media/mp2t/mp2t_stream_parser.cc
+++ b/media/mp2t/mp2t_stream_parser.cc
@@ -168,7 +168,7 @@ void Mp2tStreamParser::Init(
const NewBuffersCB& new_buffers_cb,
const NewTextBuffersCB& text_cb,
const NeedKeyCB& need_key_cb,
- const AddTextTrackCB& add_text_track_cb,
+ bool /* enable_text_tracks */ ,
const NewMediaSegmentCB& new_segment_cb,
const base::Closure& end_of_segment_cb,
const LogCB& log_cb) {
@@ -476,7 +476,8 @@ bool Mp2tStreamParser::FinishInitializationIfNeeded() {
// Pass the config before invoking the initialization callback.
RCHECK(config_cb_.Run(queue_with_config.audio_config,
- queue_with_config.video_config));
+ queue_with_config.video_config,
+ TextTrackConfigMap()));
queue_with_config.is_config_sent = true;
// For Mpeg2 TS, the duration is not known.
@@ -585,7 +586,8 @@ bool Mp2tStreamParser::EmitRemainingBuffers() {
BufferQueueWithConfig& queue_with_config = buffer_queue_chain_.front();
if (!queue_with_config.is_config_sent) {
if (!config_cb_.Run(queue_with_config.audio_config,
- queue_with_config.video_config))
+ queue_with_config.video_config,
+ TextTrackConfigMap()))
return false;
queue_with_config.is_config_sent = true;
}

Powered by Google App Engine
This is Rietveld 408576698