Merge remote-tracking branch 'origin/autofocus_control_branch' into remotecontrolling

Author: fnunnari

PythonTools/RemoteController.py

@@ -115,6 +115,28 @@ def startRec(self):
                 self.save_user_prefs()
                 sys.exit()
 
+    def enableFocus(self):
+            try:
+                if self.unlock_focus_btn.isEnabled():
+                    self.ws.send("UNLOCK_FOCUS")
+                    self.unlock_focus_btn.setEnabled(False)
+                    self.lock_focus_btn.setEnabled(True)
+            except Exception as e:
+                self.show_error_popup(f"Can't send enable focus command: {e}")
+                self.save_user_prefs()
+                sys.exit()
+
+    def lockFocus(self):
+                try:
+                    if self.lock_focus_btn.isEnabled():
+                        self.ws.send("LOCK_FOCUS")
+                        self.unlock_focus_btn.setEnabled(True)
+                        self.lock_focus_btn.setEnabled(False)
+                except Exception as e:
+                    self.show_error_popup(f"Can't send lock focus command: {e}")
+                    self.save_user_prefs()
+                    sys.exit()
+
     def stopRec(self):
         if self.stop_btn.isEnabled() and not self.start_btn.isEnabled():
             self.stop_btn.setEnabled(False)
@@ -255,14 +277,28 @@ def setupUi(self, MainWindow):
         self.stop_btn.clicked.connect(self.stopRec)
         self.stop_btn.setEnabled(False)
 
+        self.unlock_focus_btn = QtWidgets.QPushButton()
+        self.unlock_focus_btn.setFont(font)
+        self.unlock_focus_btn.setObjectName("unlock_focus_button")
+        self.unlock_focus_btn.clicked.connect(self.enableFocus)
+
+        self.lock_focus_btn = QtWidgets.QPushButton()
+        self.lock_focus_btn.setFont(font)
+        self.lock_focus_btn.setObjectName("lock_focus_button")
+        self.lock_focus_btn.clicked.connect(self.lockFocus)
+        self.lock_focus_btn.setEnabled(False)
+
         record_layout = QHBoxLayout()
         record_layout.addStretch(1)
         record_layout.addWidget(self.start_btn, 1)
         record_layout.addWidget(self.record_label)
         # record_layout.addStretch(1)
         record_layout.addWidget(self.stop_btn, 1)
         record_layout.addStretch(1)
-
+        record_layout.addWidget(self.unlock_focus_btn, 1)
+        record_layout.addStretch(1)
+        record_layout.addWidget(self.lock_focus_btn, 1)
+        record_layout.addStretch(1)
         #
         # CLIENTS STATUS
         self.status_clear_btn = QtWidgets.QPushButton()
@@ -428,6 +464,8 @@ def retranslateUi(self, MainWindow):
 
         self.download_prefix_text.setPlaceholderText(_translate("MainWindow", " Enter Session Prefix"))
         self.download_btn.setText(_translate("MainWindow", "Download"))
+        self.unlock_focus_btn.setText(_translate("MainWindow", "Unlock Focus"))
+        self.lock_focus_btn.setText(_translate("MainWindow", "Lock Focus"))
 
         self.prefix_list_btn.setText(_translate("MainWindow", "Prefix List"))
         self.phase_align_btn.setText(_translate("MainWindow", "Align Phases"))

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

@@ -17,22 +17,30 @@
 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_OFF;
+import static android.hardware.camera2.CameraMetadata.CONTROL_AF_TRIGGER_CANCEL;
+
 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;
@@ -55,27 +63,23 @@ public CaptureRequest.Builder makePreview(
           List<Surface> imageSurfaces,
           long sensorExposureTimeNs,
           int sensorSensitivity,
-          boolean wantAutoExp)
+          boolean wantAutoExp, boolean enableFocus)
           throws CameraAccessException {
 
     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);
 
-    // Auto focus is used since different devices may have different manual focus values.
-    //builder.set(CONTROL_AF_MODE, CONTROL_AF_MODE_CONTINUOUS_PICTURE);
-    builder.set(CONTROL_AF_MODE, CONTROL_AF_MODE_AUTO);
-
     if (viewfinderSurface != null) {
       builder.addTarget(viewfinderSurface);
     }
@@ -88,6 +92,7 @@ public CaptureRequest.Builder makePreview(
     return builder;
   }
 
+
   /**
    * An alternative capture request for video,
    * includes everything from preview + mediaRecorder
@@ -98,9 +103,9 @@ public CaptureRequest.Builder makeVideo(
           List<Surface> imageSurfaces,
           long sensorExposureTimeNs,
           int sensorSensitivity,
-          boolean wantAutoExp)
+          boolean wantAutoExp, boolean enableFocus)
           throws CameraAccessException {
-    CaptureRequest.Builder builder = makePreview(viewfinderSurface, imageSurfaces, sensorExposureTimeNs, sensorSensitivity, wantAutoExp);
+    CaptureRequest.Builder builder = makePreview(viewfinderSurface, imageSurfaces, sensorExposureTimeNs, sensorSensitivity, wantAutoExp, enableFocus);
     // Add recorder surface
     if (recorderSurface != null) {
       builder.addTarget(recorderSurface);
@@ -111,10 +116,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;
             }