Delete cricket::VideoFrame::ConvertToRgbBuffer.

webrtc/media/devices/gtkvideorenderer.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 GtkVideoRenderer
 
 #include "webrtc/media/devices/gtkvideorenderer.h"
 
 #include <gdk/gdk.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#include "libyuv/convert_from.h"
 #include "webrtc/media/base/videocommon.h"
 #include "webrtc/media/base/videoframe.h"
 
 namespace cricket {
 
 class ScopedGdkLock {
  public:
   ScopedGdkLock() {
     gdk_threads_enter();
   }
@@ skipping 53 matching lines @@
 
 void GtkVideoRenderer::OnFrame(const VideoFrame& video_frame) {
   const VideoFrame* frame = video_frame.GetCopyWithRotationApplied();
 
   // Need to set size as the frame might be rotated.
   if (!SetSize(frame->width(), frame->height())) {
     return;
   }
 
   // convert I420 frame to ABGR format, which is accepted by GTK
-  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(
+      frame->video_frame_buffer());
+  libyuv::ConvertFromI420(buffer->DataY(), buffer->StrideY(),
+                          buffer->DataU(), buffer->StrideU(),
+                          buffer->DataV(), buffer->StrideV(),
+                          image_.get(), frame->width() * 4,
+                          buffer->width(), buffer->height(),

[perkj_webrtc, 2016/08/30 07:13:39]

dito

+                          cricket::FOURCC_ARGB);
 
   ScopedGdkLock lock;
 
   if (IsClosed()) {
     return;
   }
 
   // draw the ABGR image
   gdk_draw_rgb_32_image(draw_area_->window,
                         draw_area_->style->fg_gc[GTK_STATE_NORMAL],
@@ skipping 42 matching lines @@
   }
 
   if (!GTK_IS_WINDOW(window_) || !GTK_IS_DRAWING_AREA(draw_area_)) {
     return true;
   }
 
   return false;
 }
 
 }  // namespace cricket