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

webrtc/examples/peerconnection/client/linux/main_wnd.cc

 /*
  *  Copyright 2012 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.
  */
 
 #include "webrtc/examples/peerconnection/client/linux/main_wnd.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <stddef.h>
 
 #include "libyuv/convert_from.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/media/engine/webrtcvideoframe.h"
 
 using rtc::sprintfn;
 
 namespace {
 
 //
 // Simple static functions that simply forward the callback to the
 // GtkMainWnd instance.
 //
 
@@ skipping 443 matching lines @@
     return;
   }
 
   width_ = width;
   height_ = height;
   image_.reset(new uint8_t[width * height * 4]);
   gdk_threads_leave();
 }
 
 void GtkMainWnd::VideoRenderer::OnFrame(
-    const cricket::VideoFrame& video_frame) {
+    const webrtc::VideoFrame& video_frame) {
   gdk_threads_enter();
 
-  const cricket::WebRtcVideoFrame 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()));
 
-  SetSize(frame.width(), frame.height());
+  SetSize(buffer->width(), buffer->height());
 
-  rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
-      frame.video_frame_buffer());
   libyuv::I420ToRGBA(buffer->DataY(), buffer->StrideY(),
                      buffer->DataU(), buffer->StrideU(),
                      buffer->DataV(), buffer->StrideV(),
                      image_.get(), width_ * 4,
                      buffer->width(), buffer->height());
 
   gdk_threads_leave();
 
   g_idle_add(Redraw, main_wnd_);
 }