media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java - Issue 2124363003: ImageCapture: Implement focus mode for Android and Fake Video Capture Devices

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/java/src/org/chromium/media/VideoCaptureCamera2.java

Issue 2124363003: ImageCapture: Implement focus mode for Android and Fake Video Capture Devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reillyg@s nit, dcheng@ comment and updated webexposed/global-interface-listing-expected.txt 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/video/android/java/src/org/chromium/media/VideoCaptureCamera.java ('k') | media/capture/video/android/photo_capabilities.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java

diff --git a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java

index 3467e81dd4564190f333ffb100108b57623cd2a1..51a32dc31a2e7f14fddbd14a8d48486c5d03cbb1 100644

--- a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java

+++ b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java

@@ -572,7 +572,12 @@ public class VideoCaptureCamera2 extends VideoCapture {

/ cameraCharacteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE)

.width();

- return new PhotoCapabilities(maxZoom, minZoom, currentZoom);

+ final int focusMode = mPreviewRequest.get(CaptureRequest.CONTROL_AF_MODE);

+ Log.d(TAG, "focusMode " + focusMode);

+ final boolean isFocusManual = (focusMode == CameraMetadata.CONTROL_AF_MODE_OFF)

+ || (focusMode == CameraMetadata.CONTROL_AF_MODE_EDOF);

+ return new PhotoCapabilities(maxZoom, minZoom, currentZoom, !isFocusManual);

}

@Override