Delete cricket::VideoFrame::ConvertToRgbBuffer.

webrtc/media/devices/gdivideorenderer.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 GdiVideoRenderer on Windows
 
 #ifdef WIN32
 
 #include "webrtc/media/devices/gdivideorenderer.h"
 
+#include "libyuv/convert_argb.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/win32window.h"
-#include "webrtc/media/base/videocommon.h"
 #include "webrtc/media/base/videoframe.h"
 
 namespace cricket {
 
 /////////////////////////////////////////////////////////////////////////////
 // Definition of private class VideoWindow. We use a worker thread to manage
 // the window.
 /////////////////////////////////////////////////////////////////////////////
 class GdiVideoRenderer::VideoWindow : public rtc::Win32Window {
  public:
@@ skipping 189 matching lines @@
     bmi_.bmiHeader.biSizeImage = width * height * 4;
     image_.reset(new uint8_t[bmi_.bmiHeader.biSizeImage]);
   }
 }
 
 void GdiVideoRenderer::VideoWindow::OnRenderFrame(const VideoFrame* frame) {
   if (!frame) {
     return;
   }
   // Convert frame to ARGB format, which is accepted by GDI
-  frame->ConvertToRgbBuffer(cricket::FOURCC_ARGB, image_.get(),
-                            bmi_.bmiHeader.biSizeImage,
-                            bmi_.bmiHeader.biWidth * 4);
+  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 * 4,
+                     buffer->width(), buffer->height());
   InvalidateRect(handle(), 0, 0);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // Implementation of class GdiVideoRenderer
 /////////////////////////////////////////////////////////////////////////////
 GdiVideoRenderer::GdiVideoRenderer(int x, int y)
     : initial_x_(x),
       initial_y_(y) {
 }
 GdiVideoRenderer::~GdiVideoRenderer() {}
 
 void GdiVideoRenderer::OnFrame(const VideoFrame& frame) {
   if (!window_.get()) { // Create the window for the first frame
     window_.reset(
         new VideoWindow(initial_x_, initial_y_, frame.width(), frame.height()));
   }
   window_->OnFrame(frame);
 }
 
 }  // namespace cricket
 #endif  // WIN32