Android video capture: use new libyuv::Android420ToI420 API for format converting.

media/capture/content/android/screen_capture_machine_android.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 "media/capture/content/android/screen_capture_machine_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "jni/ScreenCapture_jni.h"
-#include "media/base/video_capture_types.h"
-#include "media/base/yuv_convert.h"
 #include "media/capture/content/video_capture_oracle.h"
 #include "third_party/libyuv/include/libyuv.h"
 
 using base::android::AttachCurrentThread;
 
 namespace media {
 
 // static
 bool ScreenCaptureMachineAndroid::RegisterScreenCaptureMachine(JNIEnv* env) {
   return RegisterNativesImpl(env);
@@ skipping 30 matching lines @@
   ThreadSafeCaptureOracle::CaptureFrameCallback capture_frame_cb;
 
   if (!oracle_proxy_->ObserveEventAndDecideCapture(
           event, gfx::Rect(), start_time, &frame, &capture_frame_cb)) {
     return;
   }
 
   DCHECK(frame->format() == PIXEL_FORMAT_I420 ||
          frame->format() == PIXEL_FORMAT_YV12);
 
-  scoped_refptr<VideoFrame> unscaled_frame = frame;
+  scoped_refptr<VideoFrame> temp_frame = frame;
   if (frame->visible_rect().width() != width ||
       frame->visible_rect().height() != height) {
-    unscaled_frame = VideoFrame::CreateFrame(
+    temp_frame = VideoFrame::CreateFrame(
         PIXEL_FORMAT_I420, gfx::Size(width, height), gfx::Rect(width, height),
         gfx::Size(width, height), base::TimeDelta());
   }
 
   uint8_t* const src =
       reinterpret_cast<uint8_t*>(env->GetDirectBufferAddress(buf));
   CHECK(src);
 
   const int offset = top * row_stride + left * 4;
   // ABGR little endian (rgba in memory) to I420.
-  libyuv::ABGRToI420(src + offset, row_stride,
-                     unscaled_frame->visible_data(VideoFrame::kYPlane),
-                     unscaled_frame->stride(VideoFrame::kYPlane),
-                     unscaled_frame->visible_data(VideoFrame::kUPlane),
-                     unscaled_frame->stride(VideoFrame::kUPlane),
-                     unscaled_frame->visible_data(VideoFrame::kVPlane),
-                     unscaled_frame->stride(VideoFrame::kVPlane),
-                     unscaled_frame->visible_rect().width(),
-                     unscaled_frame->visible_rect().height());
+  libyuv::ABGRToI420(
+      src + offset, row_stride, temp_frame->visible_data(VideoFrame::kYPlane),

[mcasas, 2016/07/20 18:26:50]

A similar thing came up recently. I'm still not sure that 
Android provides _always_ ABGR, but will defer to you.
The best way to handle this is like in [1], checking if Skia's
kN32_SkColorType == kRGBA_8888_SkColorType

Could you (at least) add a 
DCHECK_EQ(kN32_SkColorType, kRGBA_8888_SkColorType);
?



[1]
https://cs.chromium.org/chromium/src/content/renderer/media/video_track_recor...

+      temp_frame->stride(VideoFrame::kYPlane),
+      temp_frame->visible_data(VideoFrame::kUPlane),
+      temp_frame->stride(VideoFrame::kUPlane),
+      temp_frame->visible_data(VideoFrame::kVPlane),
+      temp_frame->stride(VideoFrame::kVPlane),
+      temp_frame->visible_rect().width(), temp_frame->visible_rect().height());
 
-  if (unscaled_frame != frame) {
-    libyuv::I420Scale(unscaled_frame->visible_data(VideoFrame::kYPlane),
-                      unscaled_frame->stride(VideoFrame::kYPlane),
-                      unscaled_frame->visible_data(VideoFrame::kUPlane),
-                      unscaled_frame->stride(VideoFrame::kUPlane),
-                      unscaled_frame->visible_data(VideoFrame::kVPlane),
-                      unscaled_frame->stride(VideoFrame::kVPlane),
-                      unscaled_frame->visible_rect().width(),
-                      unscaled_frame->visible_rect().height(),
-                      frame->visible_data(VideoFrame::kYPlane),
-                      frame->stride(VideoFrame::kYPlane),
-                      frame->visible_data(VideoFrame::kUPlane),
-                      frame->stride(VideoFrame::kUPlane),
-                      frame->visible_data(VideoFrame::kVPlane),
-                      frame->stride(VideoFrame::kVPlane),
-                      frame->visible_rect().width(),
-                      frame->visible_rect().height(), libyuv::kFilterBilinear);
+  if (temp_frame != frame) {
+    libyuv::I420Scale(
+        temp_frame->visible_data(VideoFrame::kYPlane),
+        temp_frame->stride(VideoFrame::kYPlane),
+        temp_frame->visible_data(VideoFrame::kUPlane),
+        temp_frame->stride(VideoFrame::kUPlane),
+        temp_frame->visible_data(VideoFrame::kVPlane),
+        temp_frame->stride(VideoFrame::kVPlane),
+        temp_frame->visible_rect().width(), temp_frame->visible_rect().height(),
+        frame->visible_data(VideoFrame::kYPlane),
+        frame->stride(VideoFrame::kYPlane),
+        frame->visible_data(VideoFrame::kUPlane),
+        frame->stride(VideoFrame::kUPlane),
+        frame->visible_data(VideoFrame::kVPlane),
+        frame->stride(VideoFrame::kVPlane), frame->visible_rect().width(),
+        frame->visible_rect().height(), libyuv::kFilterBilinear);
   }
 
   capture_frame_cb.Run(frame, start_time, true);
 
   lastFrame_ = frame;
 }
 
 void ScreenCaptureMachineAndroid::OnI420FrameAvailable(JNIEnv* env,
                                                        jobject obj,
                                                        jobject y_buffer,
@@ skipping 16 matching lines @@
   ThreadSafeCaptureOracle::CaptureFrameCallback capture_frame_cb;
 
   if (!oracle_proxy_->ObserveEventAndDecideCapture(
           event, gfx::Rect(), start_time, &frame, &capture_frame_cb)) {
     return;
   }
 
   DCHECK(frame->format() == PIXEL_FORMAT_I420 ||
          frame->format() == PIXEL_FORMAT_YV12);
 
+  scoped_refptr<VideoFrame> temp_frame = frame;
+  if (frame->visible_rect().width() != width ||
+      frame->visible_rect().height() != height) {
+    temp_frame = VideoFrame::CreateFrame(
+        PIXEL_FORMAT_I420, gfx::Size(width, height), gfx::Rect(width, height),
+        gfx::Size(width, height), base::TimeDelta());
+  }
+
   uint8_t* const y_src =
       reinterpret_cast<uint8_t*>(env->GetDirectBufferAddress(y_buffer));
   CHECK(y_src);
   uint8_t* u_src =
       reinterpret_cast<uint8_t*>(env->GetDirectBufferAddress(u_buffer));
   CHECK(u_src);
   uint8_t* v_src =
       reinterpret_cast<uint8_t*>(env->GetDirectBufferAddress(v_buffer));
   CHECK(v_src);
 
-  // De-interleave the U and V planes into temporary buffers, if needed.
-  int uv_stride = uv_row_stride;
-  std::unique_ptr<uint8_t[]> u_tmp, v_tmp;
-  if (uv_pixel_stride != 1) {
-    // U and V planes are actually interleaved, unpack them here.
-    // TODO(braveyao): According to
-    // https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888,
-    // how U and V planes are interlaced is not guaranteed, so there is no an
-    // existing libyuv function suitable for such a job. Filed a request at
-    // https://bugs.chromium.org/p/libyuv/issues/detail?id=604. Switch to new
-    // function when it's available.
-    const int uv_plane_len = (int)env->GetDirectBufferCapacity(u_buffer);
-    u_tmp.reset(new uint8_t[(uv_plane_len + 1) / uv_pixel_stride]);
-    v_tmp.reset(new uint8_t[(uv_plane_len + 1) / uv_pixel_stride]);
-    for (int index = 0; index * uv_pixel_stride <= uv_plane_len; index++) {
-      u_tmp[index] = u_src[index * uv_pixel_stride];
-      v_tmp[index] = v_src[index * uv_pixel_stride];
-    }
-    u_src = u_tmp.get();
-    v_src = v_tmp.get();
-    uv_stride /= uv_pixel_stride;
+  const int y_offset = top * y_stride + left;
+  const int uv_offset = (top / 2) * uv_row_stride + left / 2;
+  libyuv::Android420ToI420(
+      y_src + y_offset, y_stride, u_src + uv_offset, uv_row_stride,
+      v_src + uv_offset, uv_row_stride, uv_pixel_stride,
+      temp_frame->visible_data(VideoFrame::kYPlane),
+      temp_frame->stride(VideoFrame::kYPlane),
+      temp_frame->visible_data(VideoFrame::kUPlane),
+      temp_frame->stride(VideoFrame::kUPlane),
+      temp_frame->visible_data(VideoFrame::kVPlane),
+      temp_frame->stride(VideoFrame::kVPlane),
+      temp_frame->visible_rect().width(), temp_frame->visible_rect().height());
+
+  if (temp_frame != frame) {
+    libyuv::I420Scale(
+        temp_frame->visible_data(VideoFrame::kYPlane),
+        temp_frame->stride(VideoFrame::kYPlane),
+        temp_frame->visible_data(VideoFrame::kUPlane),
+        temp_frame->stride(VideoFrame::kUPlane),
+        temp_frame->visible_data(VideoFrame::kVPlane),
+        temp_frame->stride(VideoFrame::kVPlane),
+        temp_frame->visible_rect().width(), temp_frame->visible_rect().height(),
+        frame->visible_data(VideoFrame::kYPlane),
+        frame->stride(VideoFrame::kYPlane),
+        frame->visible_data(VideoFrame::kUPlane),
+        frame->stride(VideoFrame::kUPlane),
+        frame->visible_data(VideoFrame::kVPlane),
+        frame->stride(VideoFrame::kVPlane), frame->visible_rect().width(),
+        frame->visible_rect().height(), libyuv::kFilterBilinear);
   }
 
-  const int y_offset = top * y_stride + left;
-  const int uv_offset = (top / 2) * uv_stride + left / 2;
-  // Note: If source width/height are same as the frame's width/height, the
-  // following will, internally, just perform a copy without scaling.
-  libyuv::I420Scale(y_src + y_offset, y_stride, u_src + uv_offset, uv_stride,
-                    v_src + uv_offset, uv_stride, width, height,
-                    frame->visible_data(VideoFrame::kYPlane),
-                    frame->stride(VideoFrame::kYPlane),
-                    frame->visible_data(VideoFrame::kUPlane),
-                    frame->stride(VideoFrame::kUPlane),
-                    frame->visible_data(VideoFrame::kVPlane),
-                    frame->stride(VideoFrame::kVPlane),
-                    frame->visible_rect().width(),
-                    frame->visible_rect().height(), libyuv::kFilterBilinear);
-
   capture_frame_cb.Run(frame, start_time, true);
 
   lastFrame_ = frame;
 }
 
 void ScreenCaptureMachineAndroid::OnActivityResult(JNIEnv* env,
                                                    jobject obj,
                                                    jboolean result) {
   if (!result) {
     oracle_proxy_->ReportError(FROM_HERE, "The user denied screen capture");
@@ skipping 71 matching lines @@
       frame->visible_data(VideoFrame::kUPlane),
       frame->stride(VideoFrame::kUPlane),
       frame->visible_data(VideoFrame::kVPlane),
       frame->stride(VideoFrame::kVPlane), frame->visible_rect().width(),
       frame->visible_rect().height(), libyuv::kFilterBilinear);
 
   capture_frame_cb.Run(frame, start_time, true);
 }
 
 }  // namespace media