ImageCapture.grabFrame()/<video>.captureStream(), use ABGR pixel format for Android

content/renderer/media/image_capture_frame_grabber.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/image_capture_frame_grabber.h"
 
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 61 matching lines @@
   sk_sp<SkSurface> surface = SkSurface::MakeRaster(info);
   DCHECK(surface);
 
   SkPixmap pixmap;
   if (!skia::GetWritablePixels(surface->getCanvas(), &pixmap)) {
     DLOG(ERROR) << "Error trying to map SkSurface's pixels";
     callback.Run(sk_sp<SkImage>());
     return;
   }
 
-  libyuv::I420ToARGB(frame->visible_data(media::VideoFrame::kYPlane),
-                     frame->stride(media::VideoFrame::kYPlane),
-                     frame->visible_data(media::VideoFrame::kUPlane),
-                     frame->stride(media::VideoFrame::kUPlane),
-                     frame->visible_data(media::VideoFrame::kVPlane),
-                     frame->stride(media::VideoFrame::kVPlane),
-                     static_cast<uint8*>(pixmap.writable_addr()),
-                     pixmap.width() * 4, pixmap.width(), pixmap.height());
+  const uint32 destination_pixel_format =
+      (kN32_SkColorType == kRGBA_8888_SkColorType) ? libyuv::FOURCC_ABGR
+                                                   : libyuv::FOURCC_ARGB;
+
+  libyuv::ConvertFromI420(frame->visible_data(media::VideoFrame::kYPlane),
+                          frame->stride(media::VideoFrame::kYPlane),
+                          frame->visible_data(media::VideoFrame::kUPlane),
+                          frame->stride(media::VideoFrame::kUPlane),
+                          frame->visible_data(media::VideoFrame::kVPlane),
+                          frame->stride(media::VideoFrame::kVPlane),
+                          static_cast<uint8*>(pixmap.writable_addr()),
+                          pixmap.width() * 4, pixmap.width(), pixmap.height(),
+                          destination_pixel_format);
 
   if (frame->format() == media::PIXEL_FORMAT_YV12A) {
     DCHECK(!info.isOpaque());
     // This function copies any plane into the alpha channel of an ARGB image.
     libyuv::ARGBCopyYToAlpha(frame->visible_data(media::VideoFrame::kAPlane),
                              frame->stride(media::VideoFrame::kAPlane),
                              static_cast<uint8*>(pixmap.writable_addr()),
                              pixmap.width() * 4, pixmap.width(),
                              pixmap.height());
   }
@@ skipping 40 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   MediaStreamVideoSink::DisconnectFromTrack();
   if (image)
     callbacks.PassCallbacks()->onSuccess(image);
   else
     callbacks.PassCallbacks()->onError();
 }
 
 }  // namespace content