Clean up paint callbacks in player_x11 to use media::BindToCurrentLoop().

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"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/null_audio_sink.h"
 #include "media/base/audio_hardware_config.h"
+#include "media/base/bind_to_current_loop.h"
 #include "media/base/decryptor.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/base/pipeline.h"
 #include "media/base/video_frame.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
@@ skipping 42 matching lines @@
                                  BlackPixel(g_display, screen),
                                  BlackPixel(g_display, screen));
   XStoreName(g_display, g_window, "X11 Media Player");
 
   XSelectInput(g_display, g_window,
                ExposureMask | ButtonPressMask | KeyPressMask);
   XMapWindow(g_display, g_window);
   return true;
 }
 
-typedef base::Callback<void(media::VideoFrame*)> PaintCB;
-void Paint(base::MessageLoop* message_loop, const PaintCB& paint_cb,
-           const scoped_refptr<media::VideoFrame>& video_frame) {
-  if (message_loop != base::MessageLoop::current()) {
-    message_loop->PostTask(FROM_HERE, base::Bind(
-        &Paint, message_loop, paint_cb, video_frame));
-    return;
-  }
-
-  paint_cb.Run(video_frame.get());
-}
-
 static void DoNothing() {}
 
 static void OnStatus(media::PipelineStatus status) {}
 
 static void OnMetadata(media::PipelineMetadata metadata) {}
 
 static void NeedKey(const std::string& type,
                     const std::vector<uint8>& init_data) {
   std::cout << "File is encrypted." << std::endl;
 }
 
 static void SaveStatusAndSignal(base::WaitableEvent* event,
                                 media::PipelineStatus* status_out,
                                 media::PipelineStatus status) {
   *status_out = status;
   event->Signal();
 }
 
 // TODO(vrk): Re-enabled audio. (crbug.com/112159)
 void InitPipeline(
     media::Pipeline* pipeline,
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     media::Demuxer* demuxer,
-    const PaintCB& paint_cb,
-    bool /* enable_audio */,
-    base::MessageLoop* paint_message_loop) {
+    const media::VideoRendererImpl::PaintCB& paint_cb,
+    bool /* enable_audio */) {
   // Create our filter factories.
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
   collection->SetDemuxer(demuxer);
 
   ScopedVector<media::VideoDecoder> video_decoders;
   video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner));
   scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
       task_runner,
       video_decoders.Pass(),
       media::SetDecryptorReadyCB(),
-      base::Bind(&Paint, paint_message_loop, paint_cb),
+      paint_cb,
       true));
   collection->SetVideoRenderer(video_renderer.Pass());
 
   ScopedVector<media::AudioDecoder> audio_decoders;
   audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner));
   media::AudioParameters out_params(
       media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
       media::CHANNEL_LAYOUT_STEREO,
       44100,
       16,
@@ skipping 128 matching lines @@
 
   // Initialize X11.
   if (!InitX11())
     return 1;
 
   // Initialize the pipeline thread and the pipeline.
   base::MessageLoop message_loop;
   base::Thread media_thread("MediaThread");
   media_thread.Start();
 
-  PaintCB paint_cb;
+  media::VideoRendererImpl::PaintCB paint_cb;
   if (command_line->HasSwitch("use-gl")) {
-    paint_cb = base::Bind(
-        &GlVideoRenderer::Paint, new GlVideoRenderer(g_display, g_window));
+    paint_cb = media::BindToCurrentLoop(base::Bind(
+        &GlVideoRenderer::Paint, new GlVideoRenderer(g_display, g_window)));
   } else {
-    paint_cb = base::Bind(
-        &X11VideoRenderer::Paint, new X11VideoRenderer(g_display, g_window));
+    paint_cb = media::BindToCurrentLoop(base::Bind(
+        &X11VideoRenderer::Paint, new X11VideoRenderer(g_display, g_window)));
   }
 
   scoped_ptr<media::DataSource> data_source(new DataSourceLogger(
       CreateDataSource(filename), command_line->HasSwitch("streaming")));
   scoped_ptr<media::Demuxer> demuxer(new media::FFmpegDemuxer(
       media_thread.message_loop_proxy(), data_source.get(),
       base::Bind(&NeedKey), new media::MediaLog()));
 
   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);
+               paint_cb, command_line->HasSwitch("audio"));
 
   // Main loop of the application.
   g_running = true;
 
   message_loop.PostTask(FROM_HERE, base::Bind(
       &PeriodicalUpdate, base::Unretained(&pipeline), &message_loop));
   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;
 }