Delete cricket::VideoFrame::ConvertToRgbBuffer.

webrtc/media/devices/carbonvideorenderer.cc

 /*
  *  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.
  */
 
 // Implementation of CarbonVideoRenderer
 
 #include "webrtc/media/devices/carbonvideorenderer.h"
 
+#include "libyuv/convert_from.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/media/base/videocommon.h"
 #include "webrtc/media/base/videoframe.h"
 
 namespace cricket {
 
 CarbonVideoRenderer::CarbonVideoRenderer(int x, int y)
     : image_width_(0),
       image_height_(0),
       x_(x),
@@ skipping 82 matching lines @@
 void CarbonVideoRenderer::OnFrame(const VideoFrame& video_frame) {
   {
     const VideoFrame* frame = video_frame->GetCopyWithRotationApplied();
 
     if (!SetSize(frame->width(), frame->height())) {
       return false;
     }
 
     // Grab the image lock so we are not trashing up the image being drawn.
     rtc::CritScope cs(&image_crit_);
-    frame->ConvertToRgbBuffer(cricket::FOURCC_ABGR,
-                              image_.get(),
-                              static_cast<size_t>(frame->width()) *
-                                frame->height() * 4,
-                              frame->width() * 4);
+    rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
+        video_frame->video_frame_buffer());
+    libyuv::I420ToABGR(buffer->DataY(), buffer->StrideY(),
+                       buffer->DataU(), buffer->StrideU(),
+                       buffer->DataV(), buffer->StrideV(),
+                       image_.get(), frame->width() * 4,
+                       buffer->width(), buffer->height());
   }
 
   // Trigger a repaint event for the whole window.
   Rect bounds;
   InvalWindowRect(window_ref_, GetWindowPortBounds(window_ref_, &bounds));
   return true;
 }
 
 bool CarbonVideoRenderer::Initialize() {
   OSStatus err;
@@ skipping 29 matching lines @@
   if (err != noErr) {
     LOG(LS_ERROR) << "Failed to install event handler, error code: " << err;
     return false;
   }
   SelectWindow(window_ref_);
   ShowWindow(window_ref_);
   return true;
 }
 
 }  // namespace cricket