media/video/capture/android/video_capture_device_android.cc - Issue 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/video/capture/android/video_capture_device_android.cc

Issue 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn

Patch Set: 60d13335 Export buffer_id Created 7 years, 1 month 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

« content/browser/renderer_host/media/video_capture_buffer_pool.cc ('K') | « media/base/video_frame.cc ('k') | media/video/capture/linux/video_capture_device_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/android/video_capture_device_android.cc

diff --git a/media/video/capture/android/video_capture_device_android.cc b/media/video/capture/android/video_capture_device_android.cc

index 4110753ae63326fe8d2dfac81ac042a4f439f863..38a9c82db01450d34779b19fe98cdb8df6df29fd 100644

--- a/media/video/capture/android/video_capture_device_android.cc

+++ b/media/video/capture/android/video_capture_device_android.cc

@@ -228,9 +228,13 @@ void VideoCaptureDeviceAndroid::OnFrameAvailable(

if (expected_next_frame_time_ <= current_time) {

expected_next_frame_time_ += frame_interval_;

- client_->OnIncomingCapturedFrame(

- reinterpret_cast<uint8*>(buffer), length, base::Time::Now(),

- rotation, flip_vert, flip_horiz, current_settings_);

+ client_->OnIncomingCapturedFrame(reinterpret_cast<uint8*>(buffer),

+ length,

+ base::Time::Now(),

+ rotation,

+ flip_vert,

+ flip_horiz,

+ current_settings_);

}

env->ReleaseByteArrayElements(data, buffer, JNI_ABORT);