Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/capture/content/android/screen_capture_machine_android.cc

Issue 2156003006: Android video capture: use new libyuv::Android420ToI420 API for format converting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename variable and format Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/capture/content/android/screen_capture_machine_android.h ('k') | media/capture/video/android/BUILD.gn » ('j') | media/capture/video/android/video_capture_device_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/content/android/screen_capture_machine_android.cc
diff --git a/media/capture/content/android/screen_capture_machine_android.cc b/media/capture/content/android/screen_capture_machine_android.cc
index 19327a02c5a018a9858800fff6263c7f46977013..204cb55a66263f348a46360d179d95366e0f7ee2 100644
--- a/media/capture/content/android/screen_capture_machine_android.cc
+++ b/media/capture/content/android/screen_capture_machine_android.cc
@@ -8,8 +8,6 @@
#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"
@@ -60,10 +58,10 @@ void ScreenCaptureMachineAndroid::OnRGBAFrameAvailable(JNIEnv* env,
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());
}
@@ -74,33 +72,31 @@ void ScreenCaptureMachineAndroid::OnRGBAFrameAvailable(JNIEnv* env,
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());
-
- 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);
+ 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 su
+ 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);
}
capture_frame_cb.Run(frame, start_time, true);
@@ -137,6 +133,14 @@ void ScreenCaptureMachineAndroid::OnI420FrameAvailable(JNIEnv* env,
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);
@@ -147,43 +151,36 @@ void ScreenCaptureMachineAndroid::OnI420FrameAvailable(JNIEnv* env,
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_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);
+ 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);
+ }
capture_frame_cb.Run(frame, start_time, true);
« no previous file with comments | « media/capture/content/android/screen_capture_machine_android.h ('k') | media/capture/video/android/BUILD.gn » ('j') | media/capture/video/android/video_capture_device_android.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698