player_x11 : change X/GL thread to message loop for injecting task

media/tools/player_x11/gl_video_renderer.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 "media/tools/player_x11/gl_video_renderer.h"
 
 #include <dlfcn.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xcomposite.h>
 
 #include "media/base/buffers.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 
 GlVideoRenderer* GlVideoRenderer::instance_ = NULL;
 
 GlVideoRenderer::GlVideoRenderer(Display* display, Window window)
     : display_(display),
       window_(window),
-      new_frame_(false),
-      gl_context_(NULL) {
+      gl_context_(NULL),
+      glx_thread_message_loop_(NULL) {
 }
 
 GlVideoRenderer::~GlVideoRenderer() {
 }
 
 // static
 bool GlVideoRenderer::IsMediaFormatSupported(
     const media::MediaFormat& media_format) {
   int width = 0;
   int height = 0;
@@ skipping 223 matching lines @@
   // made current on the main thread.
   glXMakeCurrent(display_, 0, NULL);
 
   // Save this instance.
   DCHECK(!instance_);
   instance_ = this;
   return true;
 }
 
 void GlVideoRenderer::OnFrameAvailable() {
-  AutoLock auto_lock(lock_);
-  new_frame_ = true;
+  if (glx_thread_message_loop()) {
+    glx_thread_message_loop()->PostTask(FROM_HERE,
+        NewRunnableMethod(this, &GlVideoRenderer::Paint));
+  }
 }
 
 void GlVideoRenderer::Paint() {
-  // Use |new_frame_| to prevent overdraw since Paint() is called more
-  // often than needed. It is OK to lock only this flag and we don't
-  // want to lock the whole function because this method takes a long
-  // time to complete.
-  {
-    AutoLock auto_lock(lock_);
-    if (!new_frame_)
-      return;
-    new_frame_ = false;
-  }
-
   scoped_refptr<media::VideoFrame> video_frame;
   GetCurrentFrame(&video_frame);
 
   if (!video_frame)
     return;
 
   // Convert YUV frame to RGB.
   DCHECK(video_frame->format() == media::VideoFrame::YV12 ||
          video_frame->format() == media::VideoFrame::YV16);
   DCHECK(video_frame->stride(media::VideoFrame::kUPlane) ==
@@ skipping 12 matching lines @@
         video_frame->height() : video_frame->height() / 2;
     glActiveTexture(GL_TEXTURE0 + i);
     glPixelStorei(GL_UNPACK_ROW_LENGTH, video_frame->stride(i));
     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, width, height, 0,
                  GL_LUMINANCE, GL_UNSIGNED_BYTE, video_frame->data(i));
   }
 
   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
   glXSwapBuffers(display_, window_);
 }