fix start camera if not running few times on Camera1Base and Camera2Base

pedroSG94 · Mar 28, 2024 · 39bd2f1 · 39bd2f1
1 parent 8f412bf
commit 39bd2f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/library/src/main/java/com/pedro/library/base/Camera1Base.java b/library/src/main/java/com/pedro/library/base/Camera1Base.java
@@ -673,8 +673,7 @@ private void startEncoders() {
     prepareGlView(videoEncoder.getWidth(), videoEncoder.getHeight(), videoEncoder.getRotation());
     if (audioInitialized) microphoneManager.start();
     cameraManager.setRotation(videoEncoder.getRotation());
-    if (!cameraManager.isRunning() && videoEncoder.getWidth() != previewWidth
-        || videoEncoder.getHeight() != previewHeight) {
+    if (!cameraManager.isRunning()) {
       cameraManager.start(videoEncoder.getWidth(), videoEncoder.getHeight(), videoEncoder.getFps());
     }
     onPreview = true;

diff --git a/library/src/main/java/com/pedro/library/base/Camera2Base.java b/library/src/main/java/com/pedro/library/base/Camera2Base.java
@@ -627,10 +627,7 @@ private void startEncoders() {
     if (audioInitialized) audioEncoder.start();
     prepareGlView(videoEncoder.getWidth(), videoEncoder.getHeight(), videoEncoder.getRotation());
     if (audioInitialized) microphoneManager.start();
-    if (glInterface == null && !cameraManager.isRunning() && videoEncoder.getWidth() != previewWidth
-        || videoEncoder.getHeight() != previewHeight) {
-      cameraManager.openLastCamera();
-    }
+    if (!cameraManager.isRunning()) cameraManager.openLastCamera();
     onPreview = true;
   }
 
@@ -914,8 +911,7 @@ private void prepareCameraManager() {
     } else if (surfaceView != null) {
       cameraManager.prepareCamera(surfaceView, videoEncoder.getInputSurface(),
           videoEncoder.getFps());
-    } else if (glInterface != null) {
-    } else {
+    } else if (glInterface == null) {
       cameraManager.prepareCamera(videoEncoder.getInputSurface(), videoEncoder.getFps());
     }
   }