From 39bd2f1e89d664fedf865d0addb4e5ca96733054 Mon Sep 17 00:00:00 2001 From: pedro Date: Thu, 28 Mar 2024 10:37:50 +0100 Subject: [PATCH] fix start camera if not running few times on Camera1Base and Camera2Base --- .../src/main/java/com/pedro/library/base/Camera1Base.java | 3 +-- .../src/main/java/com/pedro/library/base/Camera2Base.java | 8 ++------ 2 files changed, 3 insertions(+), 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 index 6ef788b4b..bd2c253bf 100644 --- 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 index 67ed4eeee..8fa3f4709 100644 --- 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()); } }