Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame.

media/tools/player_x11/x11_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/x11_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"
 
 X11VideoRenderer* X11VideoRenderer::instance_ = NULL;
 
 // Returns the picture format for ARGB.
 // This method is originally from chrome/common/x11_util.cc.
 static XRenderPictFormat* GetRenderARGB32Format(Display* dpy) {
   static XRenderPictFormat* pictformat = NULL;
   if (pictformat)
     return pictformat;
@@ skipping 123 matching lines @@
     new_frame_ = false;
   }
 
   scoped_refptr<media::VideoFrame> video_frame;
   GetCurrentFrame(&video_frame);
 
   if (!image_ ||!video_frame)
     return;
 
   // Convert YUV frame to RGB.
-  media::VideoSurface frame_in;
-  if (video_frame->Lock(&frame_in)) {
-    DCHECK(frame_in.format == media::VideoSurface::YV12 ||
-           frame_in.format == media::VideoSurface::YV16);
-    DCHECK(frame_in.strides[media::VideoSurface::kUPlane] ==
-           frame_in.strides[media::VideoSurface::kVPlane]);
-    DCHECK(frame_in.planes == media::VideoSurface::kNumYUVPlanes);
+  DCHECK(video_frame->format() == media::VideoFrame::YV12 ||
+         video_frame->format() == media::VideoFrame::YV16);
+  DCHECK(video_frame->stride(media::VideoFrame::kUPlane) ==
+         video_frame->stride(media::VideoFrame::kVPlane));
+  DCHECK(video_frame->planes() == media::VideoFrame::kNumYUVPlanes);
 
-    DCHECK(image_->data);
-    media::YUVType yuv_type = (frame_in.format == media::VideoSurface::YV12) ?
-        media::YV12 : media::YV16;
-    media::ConvertYUVToRGB32(frame_in.data[media::VideoSurface::kYPlane],
-                             frame_in.data[media::VideoSurface::kUPlane],
-                             frame_in.data[media::VideoSurface::kVPlane],
-                             (uint8*)image_->data,
-                             frame_in.width,
-                             frame_in.height,
-                             frame_in.strides[media::VideoSurface::kYPlane],
-                             frame_in.strides[media::VideoSurface::kUPlane],
-                             image_->bytes_per_line,
-                             yuv_type);
-    video_frame->Unlock();
-  } else {
-    NOTREACHED();
-  }
+  DCHECK(image_->data);
+  media::YUVType yuv_type =
+      (video_frame->format() == media::VideoFrame::YV12) ?
+      media::YV12 : media::YV16;
+  media::ConvertYUVToRGB32(video_frame->data(media::VideoFrame::kYPlane),
+                           video_frame->data(media::VideoFrame::kUPlane),
+                           video_frame->data(media::VideoFrame::kVPlane),
+                           (uint8*)image_->data,
+                           video_frame->width(),
+                           video_frame->height(),
+                           video_frame->stride(media::VideoFrame::kYPlane),
+                           video_frame->stride(media::VideoFrame::kUPlane),
+                           image_->bytes_per_line,
+                           yuv_type);
 
   if (use_render_) {
     // If XRender is used, we'll upload the image to a pixmap. And then
     // creats a picture from the pixmap and composite the picture over
     // the picture represending the window.
 
     // Creates a XImage.
     XImage image;
     memset(&image, 0, sizeof(image));
     image.width = width_;
@@ skipping 39 matching lines @@
   // If XRender is not used, simply put the image to the server.
   // This will have a tearing effect but this is OK.
   // TODO(hclam): Upload the image to a pixmap and do XCopyArea()
   // to the window.
   GC gc = XCreateGC(display_, window_, 0, NULL);
   XPutImage(display_, window_, gc, image_,
             0, 0, 0, 0, width_, height_);
   XFlush(display_);
   XFreeGC(display_, gc);
 }