lock unlock focus feature done

Author: skp-github

app/src/main/java/com/googleresearch/capturesync/CaptureRequestFactory.java

@@ -17,22 +17,31 @@
 package com.googleresearch.capturesync;
 
 import static android.hardware.camera2.CameraDevice.TEMPLATE_PREVIEW;
+import static android.hardware.camera2.CameraDevice.TEMPLATE_MANUAL;
 import static android.hardware.camera2.CameraMetadata.CONTROL_AE_MODE_OFF;
 import static android.hardware.camera2.CameraMetadata.CONTROL_AF_MODE_AUTO;
+import static android.hardware.camera2.CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_VIDEO;
+import static android.hardware.camera2.CameraMetadata.CONTROL_AF_MODE_OFF;
+import static android.hardware.camera2.CameraMetadata.CONTROL_AF_TRIGGER_CANCEL;
+import static android.hardware.camera2.CameraMetadata.CONTROL_AF_TRIGGER_IDLE;
 import static android.hardware.camera2.CameraMetadata.CONTROL_AWB_MODE_AUTO;
 import static android.hardware.camera2.CameraMetadata.CONTROL_MODE_AUTO;
 import static android.hardware.camera2.CaptureRequest.CONTROL_AE_MODE;
 import static android.hardware.camera2.CaptureRequest.CONTROL_AF_MODE;
 import static android.hardware.camera2.CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE;
+import static android.hardware.camera2.CaptureRequest.CONTROL_AF_TRIGGER;
 import static android.hardware.camera2.CaptureRequest.CONTROL_AWB_MODE;
 import static android.hardware.camera2.CaptureRequest.CONTROL_MODE;
+import static android.hardware.camera2.CaptureRequest.LENS_FOCUS_DISTANCE;
 import static android.hardware.camera2.CaptureRequest.SENSOR_EXPOSURE_TIME;
 import static android.hardware.camera2.CaptureRequest.SENSOR_SENSITIVITY;
 
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
 import android.view.Surface;
+import android.widget.Toast;
+
 import com.googleresearch.capturesync.ImageMetadataSynchronizer.CaptureRequestTag;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,23 +70,16 @@ public CaptureRequest.Builder makePreview(
     CaptureRequest.Builder builder = device.createCaptureRequest(TEMPLATE_PREVIEW);
     if (wantAutoExp) {
       builder.set(CONTROL_AE_MODE, CONTROL_AWB_MODE_AUTO);
-
     } else {
       // Manually set exposure and sensitivity using UI sliders on the leader.
       builder.set(CONTROL_AE_MODE, CONTROL_AE_MODE_OFF);
       builder.set(SENSOR_EXPOSURE_TIME, sensorExposureTimeNs);
       builder.set(SENSOR_SENSITIVITY, sensorSensitivity);
     }
-
+    builder.set(CONTROL_AF_TRIGGER, CONTROL_AF_TRIGGER_CANCEL);
+    builder.set(CONTROL_AF_MODE, CONTROL_AF_MODE_OFF);
     // Auto white balance used, these could be locked and sent from the leader instead.
     builder.set(CONTROL_AWB_MODE, CONTROL_AWB_MODE_AUTO);
-    if(enableFocus==true){
-      builder.set(CONTROL_AF_MODE, CONTROL_AF_MODE_CONTINUOUS_PICTURE);
-    }else{
-      builder.set(CONTROL_AF_MODE, CONTROL_AF_MODE_AUTO);
-    }
-
-
 
     if (viewfinderSurface != null) {
       builder.addTarget(viewfinderSurface);
@@ -91,6 +93,7 @@ public CaptureRequest.Builder makePreview(
     return builder;
   }
 
+
   /**
    * An alternative capture request for video,
    * includes everything from preview + mediaRecorder
@@ -114,10 +117,13 @@ public CaptureRequest.Builder makeVideo(
 
   public CaptureRequest.Builder makeFrameInjectionRequest(
           long desiredExposureTimeNs, List<Surface> imageSurfaces) throws CameraAccessException {
+
     CaptureRequest.Builder builder = device.createCaptureRequest(TEMPLATE_PREVIEW);
     builder.set(CONTROL_MODE, CONTROL_MODE_AUTO);
     builder.set(CONTROL_AE_MODE, CONTROL_AE_MODE_OFF);
     builder.set(SENSOR_EXPOSURE_TIME, desiredExposureTimeNs);
+    builder.set(CONTROL_AF_TRIGGER, CONTROL_AF_TRIGGER_CANCEL);
+    builder.set(CONTROL_AF_MODE, CONTROL_AF_MODE_OFF);
     // TODO: Inserting frame duration directly would be more accurate than inserting exposure since
     // {@code frame duration ~ exposure + variable overhead}. However setting frame duration may not
     // be supported on many android devices, so we use exposure time here.

app/src/main/java/com/googleresearch/capturesync/ImageMetadataSynchronizer.java

@@ -16,6 +16,10 @@
 
 package com.googleresearch.capturesync;
 
+import static android.hardware.camera2.CameraMetadata.CONTROL_AF_MODE_AUTO;
+import static android.hardware.camera2.CameraMetadata.CONTROL_AF_MODE_OFF;
+import static android.hardware.camera2.CaptureRequest.CONTROL_AF_MODE;
+
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
 import android.hardware.camera2.CaptureRequest;
@@ -377,6 +381,13 @@ private void createCaptureCallback() {
           @Override
           public void onCaptureCompleted(
               CameraCaptureSession session, CaptureRequest request, TotalCaptureResult result) {
+              Float focusDistance = result.get(CaptureResult.LENS_FOCUS_DISTANCE);
+            if (focusDistance != null) {
+              context.setCurrentFocusDistance(focusDistance);
+            } else {
+              focusDistance = context.getCurrentFocusDistance();
+              context.setCurrentFocusDistance(0.0f);
+            }
             if (closed) {
               return;
             }