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

webrtc/examples/peerconnection/client/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/main_wnd.h"
 
 #include <math.h>
 
 #include "libyuv/convert_argb.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/media/engine/webrtcvideoframe.h"
 
 ATOM MainWnd::wnd_class_ = 0;
 const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd";
 
 using rtc::sprintfn;
 
 namespace {
 
 const char kConnecting[] = "Connecting... ";
 const char kNoVideoStreams[] = "(no video streams either way)";
@@ skipping 563 matching lines @@
   }
 
   bmi_.bmiHeader.biWidth = width;
   bmi_.bmiHeader.biHeight = -height;
   bmi_.bmiHeader.biSizeImage = width * height *
                                (bmi_.bmiHeader.biBitCount >> 3);
   image_.reset(new uint8_t[bmi_.bmiHeader.biSizeImage]);
 }
 
 void MainWnd::VideoRenderer::OnFrame(
-    const cricket::VideoFrame& video_frame) {
+    const webrtc::VideoFrame& video_frame) {
 
   {
     AutoLock<VideoRenderer> lock(this);
 
-    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());
 
     ASSERT(image_.get() != NULL);
-    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(),
                        bmi_.bmiHeader.biWidth *
                            bmi_.bmiHeader.biBitCount / 8,
                        buffer->width(), buffer->height());
   }
   InvalidateRect(wnd_, NULL, TRUE);
 }