Reland of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame.

webrtc/media/devices/gtkvideorenderer.cc

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 // Implementation of GtkVideoRenderer
 
 #include "webrtc/media/devices/gtkvideorenderer.h"
+#include "webrtc/video_frame.h"
 
 #include <gdk/gdk.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 
 #include "libyuv/convert_argb.h"
-#include "webrtc/media/engine/webrtcvideoframe.h"
 
 namespace cricket {
 
 class ScopedGdkLock {
  public:
   ScopedGdkLock() {
     gdk_threads_enter();
   }
 
   ~ScopedGdkLock() {
@@ skipping 42 matching lines @@
   }
 
   image_.reset(new uint8_t[width * height * 4]);
   gtk_widget_set_size_request(draw_area_, width, height);
 
   width_ = width;
   height_ = height;
   return true;
 }
 
-void GtkVideoRenderer::OnFrame(const VideoFrame& video_frame) {
-  const cricket::WebRtcVideoFrame frame(
+void GtkVideoRenderer::OnFrame(const webrtc::VideoFrame& video_frame) {
+  rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
       webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(),
-                                 video_frame.rotation()),
-      webrtc::kVideoRotation_0, video_frame.timestamp_us());
+                                 video_frame.rotation()));
 
   // Need to set size as the frame might be rotated.
-  if (!SetSize(frame.width(), frame.height())) {
+  if (!SetSize(buffer->width(), buffer->height())) {
     return;
   }
 
   // convert I420 frame to ABGR format, which is accepted by GTK
-  rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
-      frame.video_frame_buffer());
   libyuv::I420ToARGB(buffer->DataY(), buffer->StrideY(),
                      buffer->DataU(), buffer->StrideU(),
                      buffer->DataV(), buffer->StrideV(),
-                     image_.get(), frame.width() * 4,
+                     image_.get(), buffer->width() * 4,
                      buffer->width(), buffer->height());
 
   ScopedGdkLock lock;
 
   if (IsClosed()) {
     return;
   }
 
   // draw the ABGR image
   gdk_draw_rgb_32_image(draw_area_->window,
                         draw_area_->style->fg_gc[GTK_STATE_NORMAL],
                         0,
                         0,
-                        frame.width(),
-                        frame.height(),
+                        buffer->width(),
+                        buffer->height(),
                         GDK_RGB_DITHER_MAX,
                         image_.get(),
-                        frame.width() * 4);
+                        buffer->width() * 4);
 
   // Run the Gtk main loop to refresh the window.
   Pump();
 }
 
 bool GtkVideoRenderer::Initialize(int width, int height) {
   gtk_init(NULL, NULL);
   window_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   draw_area_ = gtk_drawing_area_new();
   if (!window_ || !draw_area_) {
@@ skipping 25 matching lines @@
   }
 
   if (!GTK_IS_WINDOW(window_) || !GTK_IS_DRAWING_AREA(draw_area_)) {
     return true;
   }
 
   return false;
 }
 
 }  // namespace cricket