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

webrtc/media/base/fakevideorenderer.h

 /*
  *  Copyright (c) 2011 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.
  */
 
 #ifndef WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
 #define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
 
 #include "webrtc/base/logging.h"
-#include "webrtc/media/base/videoframe.h"
 #include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/video_frame.h"
 
 namespace cricket {
 
 // Faked video renderer that has a callback for actions on rendering.
-class FakeVideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
+class FakeVideoRenderer : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
  public:
   FakeVideoRenderer()
       : errors_(0),
         width_(0),
         height_(0),
         rotation_(webrtc::kVideoRotation_0),
         timestamp_us_(0),
         num_rendered_frames_(0),
         black_frame_(false) {}
 
-  virtual void OnFrame(const VideoFrame& frame) {
+  virtual void OnFrame(const webrtc::VideoFrame& frame) {
     rtc::CritScope cs(&crit_);
     // TODO(zhurunz) Check with VP8 team to see if we can remove this
     // tolerance on Y values. Some unit tests produce Y values close
     // to 16 rather than close to zero, for supposedly black frames.
     // Largest value observed is 34, e.g., running
     // P2PTestConductor.LocalP2PTest16To9 (peerconnection_unittests).
     black_frame_ = CheckFrameColorYuv(0, 48, 128, 128, 128, 128, &frame);
     // Treat unexpected frame size as error.
     ++num_rendered_frames_;
     width_ = frame.width();
@@ skipping 29 matching lines @@
     return black_frame_;
   }
 
  private:
   static bool CheckFrameColorYuv(uint8_t y_min,
                                  uint8_t y_max,
                                  uint8_t u_min,
                                  uint8_t u_max,
                                  uint8_t v_min,
                                  uint8_t v_max,
-                                 const cricket::VideoFrame* frame) {
+                                 const webrtc::VideoFrame* frame) {
     if (!frame || !frame->video_frame_buffer()) {
       return false;
     }
     // Y
     int y_width = frame->width();
     int y_height = frame->height();
     const uint8_t* y_plane = frame->video_frame_buffer()->DataY();
     const uint8_t* y_pos = y_plane;
     int32_t y_pitch = frame->video_frame_buffer()->StrideY();
     for (int i = 0; i < y_height; ++i) {
@@ skipping 37 matching lines @@
   webrtc::VideoRotation rotation_;
   int64_t timestamp_us_;
   int num_rendered_frames_;
   bool black_frame_;
   rtc::CriticalSection crit_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_