Remove MessageLoop methods from Filter interface

media/tools/player_x11/player_x11.cc

 // Copyright (c) 2010 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 <iostream>
 #include <signal.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "media/base/callback.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media.h"
 #include "media/base/media_switches.h"
+#include "media/base/message_loop_factory_impl.h"
 #include "media/base/pipeline_impl.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
 #include "media/filters/null_audio_renderer.h"
 #include "media/filters/omx_video_decoder.h"
 
 // TODO(jiesun): implement different video decode contexts according to
@@ skipping 46 matching lines @@
 
   XSelectInput(g_display, g_window,
                ExposureMask | ButtonPressMask | KeyPressMask);
   XMapWindow(g_display, g_window);
   return true;
 }
 
 bool InitPipeline(MessageLoop* message_loop,
                   const char* filename, bool enable_audio,
                   scoped_refptr<media::PipelineImpl>* pipeline,
-                  MessageLoop* paint_message_loop) {
+                  MessageLoop* paint_message_loop,
+                  scoped_refptr<media::MessageLoopFactory> message_loop_factory) {
   // Initialize OpenMAX.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableOpenMax) &&
       !media::InitializeOpenMaxLibrary(FilePath())) {
     std::cout << "Unable to initialize OpenMAX library."<< std::endl;
     return false;
   }
 
   // Load media libraries.
   if (!media::InitializeMediaLibrary(FilePath())) {
     std::cout << "Unable to initialize the media library." << std::endl;
     return false;
   }
 
   // Create our filter factories.
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
   collection->AddDataSource(new media::FileDataSource());
-  collection->AddDemuxer(new media::FFmpegDemuxer());
-  collection->AddAudioDecoder(new media::FFmpegAudioDecoder());
+  collection->AddDemuxer(new media::FFmpegDemuxer(
+      message_loop_factory->GetMessageLoop("DemuxThread")));
+  collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
+      message_loop_factory->GetMessageLoop("AudioDecoderThread")));
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableOpenMax)) {
-    collection->AddVideoDecoder(new media::OmxVideoDecoder(NULL));
+    collection->AddVideoDecoder(new media::OmxVideoDecoder(
+        message_loop_factory->GetMessageLoop("VideoDecoderThread"),
+        NULL));
   } else {
-    collection->AddVideoDecoder(new media::FFmpegVideoDecoder(NULL));
+    collection->AddVideoDecoder(new media::FFmpegVideoDecoder(
+        message_loop_factory->GetMessageLoop("VideoDecoderThread"),
+        NULL));
   }
   collection->AddVideoRenderer(new Renderer(g_display,
                                             g_window,
                                             paint_message_loop));
 
   if (enable_audio)
     collection->AddAudioRenderer(new media::AudioRendererImpl());
   else
     collection->AddAudioRenderer(new media::NullAudioRenderer());
 
@@ skipping 115 matching lines @@
   // Install the signal handler.
   signal(SIGTERM, &TerminateHandler);
   signal(SIGINT, &TerminateHandler);
 
   // Initialize X11.
   if (!InitX11())
     return 1;
 
   // Initialize the pipeline thread and the pipeline.
   base::AtExitManager at_exit;
+  scoped_refptr<media::MessageLoopFactory> message_loop_factory(
+      new media::MessageLoopFactoryImpl());
   scoped_ptr<base::Thread> thread;
   scoped_refptr<media::PipelineImpl> pipeline;
   MessageLoop message_loop;
   thread.reset(new base::Thread("PipelineThread"));
   thread->Start();
   if (InitPipeline(thread->message_loop(), filename.c_str(),
-                   enable_audio, &pipeline, &message_loop)) {
+                   enable_audio, &pipeline, &message_loop,
+                   message_loop_factory)) {
     // Main loop of the application.
     g_running = true;
 
     // Check if video is present.
     audio_only = !pipeline->IsRendered(media::mime_type::kMajorTypeVideo);
 
     message_loop.PostTask(FROM_HERE,
         NewRunnableFunction(PeriodicalUpdate, pipeline,
                             &message_loop, audio_only));
     message_loop.Run();
   } else{
     std::cout << "Pipeline initialization failed..." << std::endl;
   }
 
   // Cleanup tasks.
   thread->Stop();
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   return 0;
 }