media/capture/video/android/video_capture_device_android.h - Issue 2164473002: ImageCapture: wire PhotoCapabilities' ISO, width, height and PhotoSettings' width and height

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 2164473002: ImageCapture: wire PhotoCapabilities' ISO, width, height and PhotoSettings' width and height (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java ('K') | « media/capture/video/android/photo_capabilities.cc ('k') | media/capture/video/android/video_capture_device_android.cc » ('j') | media/capture/video/android/video_capture_device_android.cc » ('J')
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 ce6fd9de6cba9a249b32fef760545827ff3c25c2..acf01a0acba0171276ab2ab170a90f5bfbe33a34 100644

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

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

@@ -104,6 +104,8 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {

base::Lock photo_callbacks_lock_;

std::list<std::unique_ptr<TakePhotoCallback>> photo_callbacks_;

+ gfx::Size next_photo_resolution_;

Name device_name_;

VideoCaptureFormat capture_format_;