Delete cricket::VideoFrame::ConvertToRgbBuffer.

webrtc/examples/peerconnection/client/linux/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/linux/main_wnd.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <stddef.h>
 
+#include "libyuv/convert_from.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringutils.h"
 
 using rtc::sprintfn;
 
 namespace {
 
 //
@@ skipping 455 matching lines @@
 
 void GtkMainWnd::VideoRenderer::OnFrame(
     const cricket::VideoFrame& video_frame) {
   gdk_threads_enter();
 
   const cricket::VideoFrame* frame = video_frame.GetCopyWithRotationApplied();
 
   SetSize(frame->width(), frame->height());
 
   int size = width_ * height_ * 4;
+
   // TODO(henrike): Convert directly to RGBA

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

Did you check if there is a RGBA convert in libyuv?

[nisse-webrtc, 2016/08/30 07:46:07]

There is, it seems. One could also call I420ToRGBA directly, without going via
ConvertFromI420. And similarly for the other calls. Which is better in most
ways.

I'll give it a try. I'm just a little bit worried about making changes to files
which lack tests completely.

-  frame->ConvertToRgbBuffer(cricket::FOURCC_ARGB,
-                            image_.get(),
-                            size,
-                            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(), width_ * 4,
+                          buffer->width(), buffer->height(),
+                          cricket::FOURCC_ARGB);

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

use libyuv type not cricket::FOURCC_... 

+
   // Convert the B,G,R,A frame to R,G,B,A, which is accepted by GTK.
   // The 'A' is just padding for GTK, so we can use it as temp.
   uint8_t* pix = image_.get();
   uint8_t* end = image_.get() + size;
   while (pix < end) {
     pix[3] = pix[0];     // Save B to A.
     pix[0] = pix[2];  // Set Red.
     pix[2] = pix[3];  // Set Blue.
     pix[3] = 0xFF;     // Fixed Alpha.
     pix += 4;
   }
 
   gdk_threads_leave();
 
   g_idle_add(Redraw, main_wnd_);
 }