1. support stop mode for omx

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/Xlib.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
+#include "base/waitable_event.h"
 #include "media/base/media.h"
 #include "media/base/media_switches.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"
@@ skipping 110 matching lines @@
     XEvent e;
     XNextEvent(g_display, &e);
     if (e.type == Expose) {
       if (!audio_only) {
         // Tell the renderer to paint.
         DCHECK(Renderer::instance());
         Renderer::instance()->Paint();
       }
     } else if (e.type == ButtonPress) {
       g_running = false;
-      message_loop->Quit();
+      // QuitNow is more responsive than Quit since renderer_base is till
+      // posting paint messages.
+      message_loop->QuitNow();
       return;
     }
   }
 
   message_loop->PostDelayedTask(FROM_HERE,
       NewRunnableFunction(PeriodicalUpdate, message_loop, audio_only), 10);
 }
 
 int main(int argc, char** argv) {
   // Read arguments.
@@ skipping 19 matching lines @@
   signal(SIGINT, &TerminateHandler);
 
   // Initialize X11.
   if (!InitX11())
     return 1;
 
   // Initialize the pipeline thread and the pipeline.
   base::AtExitManager at_exit;
   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)) {
     // Main loop of the application.
     g_running = true;
 
     // Check if video is present.
     audio_only = !pipeline->IsRendered(media::mime_type::kMajorTypeVideo);
 
-    MessageLoop message_loop;
     if (!audio_only) {
       // Tell the renderer to paint.
       DCHECK(Renderer::instance());
       Renderer::instance()->set_glx_thread_message_loop(&message_loop);
     }
 
     message_loop.PostTask(FROM_HERE,
         NewRunnableFunction(PeriodicalUpdate, &message_loop, audio_only));
     message_loop.Run();
 
-    pipeline->Stop(NULL);
+    // Need to wait for pipeline to be fully stopped before stopping the thread.
+    base::WaitableEvent event(false, false);
+    pipeline->Stop(NewCallback(&event, &base::WaitableEvent::Signal));
+    event.Wait();
   } else{
     std::cout << "Pipeline initialization failed..." << std::endl;
   }
 
   // Cleanup tasks.
   thread->Stop();
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   return 0;
 }