media/tools/player_x11/player_x11.cc - Issue 23702007: Render inband text tracks in the media pipeline

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/tools/player_x11/player_x11.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 (9/28) Created 7 years, 3 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:

Index: media/tools/player_x11/player_x11.cc

diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc

index c154e6937e25fba06a00b3825a2edf03ca77c696..fa8981d8d2ed2d4a599863a1718a3a04686f70ed 100644

--- a/media/tools/player_x11/player_x11.cc

+++ b/media/tools/player_x11/player_x11.cc

@@ -277,9 +277,10 @@ int main(int argc, char** argv) {

scoped_ptr<media::DataSource> data_source(new DataSourceLogger(

CreateDataSource(filename), command_line->HasSwitch("streaming")));

+ media::FFmpegAddTextTrackCB add_text_track_cb;

scoped_ptr<media::Demuxer> demuxer(new media::FFmpegDemuxer(

media_thread.message_loop_proxy(), data_source.get(),

- base::Bind(&NeedKey), new media::MediaLog()));

+ base::Bind(&NeedKey), add_text_track_cb, new media::MediaLog()));

acolwell GONE FROM CHROMIUM 2013/10/08 15:45:24 nit: I don't believe this compiles. I think you ne

Matthew Heaney (Chromium) 2013/10/13 05:30:17 Done.

media::Pipeline pipeline(media_thread.message_loop_proxy(),

new media::MediaLog());