media/capture/video/android/video_capture_device_android.h - Issue 2272873002: Android video capture: only use reference time for outbound timestamp.

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/capture/video/android/video_capture_device_android.h

Issue 2272873002: Android video capture: only use reference time for outbound timestamp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: estimate a timestamp in Camera1 callback Created 4 years, 3 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/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java ('k') | media/capture/video/android/video_capture_device_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a0796eec803a5d4e99c73865f5f37e6c36203e03..9830e8aeba099bee3f310e086dc137a08973d945 100644

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

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

@@ -87,7 +87,8 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {

jint uv_pixel_stride,

jint width,

jint height,

- jint rotation);

+ jint rotation,

+ jlong timestamp);

// Implement org.chromium.media.VideoCapture.nativeOnError.

void OnError(JNIEnv* env,

@@ -130,7 +131,6 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {

std::list<base::Closure> photo_requests_queue_;

base::TimeTicks expected_next_frame_time_;

- base::TimeTicks first_ref_time_;

base::TimeDelta frame_interval_;

// List of |photo_callbacks_| in flight, being served in Java side.