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

Unified Diff: media/mp3/mp3_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: 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/mp3/mp3_stream_parser.h ('k') | media/mp3/mp3_stream_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mp3/mp3_stream_parser.cc
diff --git a/media/mp3/mp3_stream_parser.cc b/media/mp3/mp3_stream_parser.cc
index 5d2f8c1d7594ffd861ce46adceac9476c3d72ce6..b20756cd2283630cd0a8f065ae8f07195cdf88d8 100644
--- a/media/mp3/mp3_stream_parser.cc
+++ b/media/mp3/mp3_stream_parser.cc
@@ -10,6 +10,7 @@
#include "media/base/bit_reader.h"
#include "media/base/buffers.h"
#include "media/base/stream_parser_buffer.h"
+#include "media/base/text_track_config.h"
#include "media/base/video_decoder_config.h"
#include "net/http/http_util.h"
@@ -119,7 +120,6 @@ void MP3StreamParser::Init(const InitCB& init_cb,
const NewBuffersCB& new_buffers_cb,
const NewTextBuffersCB& text_cb,
const NeedKeyCB& need_key_cb,
- const AddTextTrackCB& add_text_track_cb,
const NewMediaSegmentCB& new_segment_cb,
const base::Closure& end_of_segment_cb,
const LogCB& log_cb) {
@@ -410,7 +410,7 @@ int MP3StreamParser::ParseMP3Frame(const uint8* data,
timestamp_helper_->SetBaseTimestamp(base_timestamp);
VideoDecoderConfig video_config;
- bool success = config_cb_.Run(config_, video_config);
+ bool success = config_cb_.Run(config_, video_config, TextTrackConfigMap());
if (!init_cb_.is_null())
base::ResetAndReturn(&init_cb_).Run(success, kInfiniteDuration());
« no previous file with comments | « media/mp3/mp3_stream_parser.h ('k') | media/mp3/mp3_stream_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698