Render inband text tracks in the media pipeline

media/tools/player_x11/player_x11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <signal.h>
 
 #include <iostream>  // NOLINT
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 259 matching lines @@
   if (command_line->HasSwitch("use-gl")) {
     paint_cb = base::Bind(
         &GlVideoRenderer::Paint, new GlVideoRenderer(g_display, g_window));
   } else {
     paint_cb = base::Bind(
         &X11VideoRenderer::Paint, new X11VideoRenderer(g_display, g_window));
   }
 
   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 need a bool here.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

 
   media::Pipeline pipeline(media_thread.message_loop_proxy(),
                            new media::MediaLog());
   InitPipeline(&pipeline, media_thread.message_loop_proxy(), demuxer.get(),
                paint_cb, command_line->HasSwitch("audio"), &message_loop);
 
   // Main loop of the application.
   g_running = true;
 
   message_loop.PostTask(FROM_HERE, base::Bind(
       &PeriodicalUpdate, base::Unretained(&pipeline), &message_loop,
       !pipeline.HasVideo()));
   message_loop.Run();
 
   // Cleanup tasks.
   media_thread.Stop();
 
   // Release callback which releases video renderer. Do this before cleaning up
   // X below since the video renderer has some X cleanup duties as well.
   paint_cb.Reset();
 
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   g_audio_manager = NULL;
 
   return 0;
 }