fix setZoom motion with camera2

pedroSG94 · Sep 11, 2024 · 168ce4b · 168ce4b
1 parent 626c2da
commit 168ce4b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java b/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
@@ -277,6 +277,7 @@ public int getMaxZoom() {
   public int getMinZoom() { return 0; }
 
   public void setZoom(MotionEvent event) {
+    if (event.getPointerCount() < 2 || event.getAction() != MotionEvent.ACTION_MOVE) return;
     try {
       if (camera != null && running && camera.getParameters() != null && camera.getParameters()
           .isZoomSupported()) {

diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.kt b/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.kt
@@ -723,23 +723,16 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
         }
     }
 
-    fun setZoom(event: MotionEvent) {
-        val currentFingerSpacing: Float
-        if (event.pointerCount > 1) {
-            currentFingerSpacing = CameraHelper.getFingerSpacing(event)
-            val delta = 0.1f
-            if (fingerSpacing != 0f) {
-                var newLevel = zoomLevel
-                if (currentFingerSpacing > fingerSpacing) {
-                    newLevel += delta
-                } else if (currentFingerSpacing < fingerSpacing) {
-                    newLevel -= delta
-                }
-                //This method avoid out of range
-                zoomLevel = newLevel
-            }
-            fingerSpacing = currentFingerSpacing
-        }
+    @JvmOverloads
+    fun setZoom(event: MotionEvent, delta: Float = 0.1f) {
+        if (event.pointerCount < 2 || event.action != MotionEvent.ACTION_MOVE) return
+        val currentFingerSpacing = CameraHelper.getFingerSpacing(event)
+        if (currentFingerSpacing > fingerSpacing) {
+            zoom += delta
+        } else if (currentFingerSpacing < fingerSpacing) {
+            zoom -= delta
+        }
+        fingerSpacing = currentFingerSpacing
     }
 
     fun stopRepeatingEncoder() {

diff --git a/library/src/main/java/com/pedro/library/base/Camera2Base.java b/library/src/main/java/com/pedro/library/base/Camera2Base.java
@@ -784,6 +784,10 @@ public void setZoom(MotionEvent event) {
         cameraManager.setZoom(event);
     }
 
+    public void setZoom(MotionEvent event, float delta) {
+        cameraManager.setZoom(event, delta);
+    }
+
     /**
      * @Experimental
      * @return optical zoom values available

diff --git a/library/src/main/java/com/pedro/library/util/sources/video/Camera2Source.kt b/library/src/main/java/com/pedro/library/util/sources/video/Camera2Source.kt
@@ -147,8 +147,9 @@ class Camera2Source(context: Context): VideoSource() {
     return camera.tapToFocus(event)
   }
 
-  fun setZoom(event: MotionEvent) {
-    if (isRunning()) camera.setZoom(event)
+  @JvmOverloads
+  fun setZoom(event: MotionEvent, delta: Float = 0.1f) {
+    if (isRunning()) camera.setZoom(event, delta)
   }
 
   fun setZoom(level: Float) {