fix(*): fix few issues with the preview view and camera source for preview

Author: ThibaultBee

core/src/main/java/io/github/thibaultbee/streampack/core/elements/sources/video/camera/CameraSource.kt

@@ -132,16 +132,29 @@ internal class CameraSource(
     override suspend fun hasPreview() = controller.hasOutput(PREVIEW_NAME)
 
     @RequiresPermission(Manifest.permission.CAMERA)
-    override suspend fun setPreview(surface: Surface) {
+    private suspend fun setPreviewUnsafe(surface: Surface) {
         if (isPreviewingFlow.value) {
             Logger.w(TAG, "Trying to set preview while previewing")
         }
         controller.addOutput(CameraSurface(PREVIEW_NAME, surface))
     }
 
+    @RequiresPermission(Manifest.permission.CAMERA)
+    override suspend fun setPreview(surface: Surface) {
+        withContext(defaultDispatcher) {
+            previewMutex.withLock {
+                setPreviewUnsafe(surface)
+            }
+        }
+    }
+
     @SuppressLint("MissingPermission")
     override suspend fun resetPreviewImpl() {
-        controller.removeOutput(PREVIEW_NAME)
+        withContext(defaultDispatcher) {
+            previewMutex.withLock {
+                controller.removeOutput(PREVIEW_NAME)
+            }
+        }
     }
 
     override suspend fun getOutput() = controller.getOutput(STREAM_NAME)?.surface
@@ -192,7 +205,6 @@ internal class CameraSource(
     private suspend fun startPreviewUnsafe() {
         if (isPreviewingFlow.value) {
             Logger.w(TAG, "Camera is already previewing")
-            return
         }
         controller.addTarget(PREVIEW_NAME)
         _isPreviewingFlow.emit(true)
@@ -214,11 +226,7 @@ internal class CameraSource(
     override suspend fun startPreview(previewSurface: Surface) {
         withContext(defaultDispatcher) {
             previewMutex.withLock {
-                if (isPreviewingFlow.value) {
-                    Logger.w(TAG, "Camera is already previewing")
-                    return@withContext
-                }
-                setPreview(previewSurface)
+                setPreviewUnsafe(previewSurface)
                 startPreviewUnsafe()
             }
         }
@@ -228,7 +236,6 @@ internal class CameraSource(
     override suspend fun stopPreview() {
         withContext(defaultDispatcher) {
             previewMutex.withLock {
-                Logger.d(TAG, "Stopping preview")
                 if (!isPreviewingFlow.value) {
                     Logger.w(TAG, "Camera is not previewing")
                     return@withContext
@@ -253,15 +260,13 @@ internal class CameraSource(
             Logger.w(TAG, "Camera is already streaming")
             return
         }
-        Logger.d(TAG, "startStream")
         controller.addTarget(STREAM_NAME)
         _isStreamingFlow.emit(true)
         controller.muteVibrationAndSound()
     }
 
     @SuppressLint("MissingPermission")
     override suspend fun stopStream() = streamMutex.withLock {
-        Logger.d(TAG, "stopStream")
         if (!isStreamingFlow.value) {
             Logger.w(TAG, "Camera is not streaming")
             return

core/src/main/java/io/github/thibaultbee/streampack/core/elements/sources/video/camera/controllers/CameraController.kt

@@ -106,6 +106,7 @@ internal class CameraController(
         withContext(defaultDispatcher) {
             controllerMutex.withLock {
                 if (outputs.values.contains(output)) {
+                    Logger.w(TAG, "Output is already added: $output")
                     return@withContext
                 }
                 outputs[output.name] = output
@@ -125,8 +126,7 @@ internal class CameraController(
     suspend fun removeOutput(name: String) {
         withContext(defaultDispatcher) {
             controllerMutex.withLock {
-                val needRestart = outputs.containsKey(name) && isActiveFlow.value
-                outputs.remove(name) != null
+                val needRestart = outputs.remove(name) != null && isActiveFlow.value
                 if (needRestart) {
                     restartSessionUnsafe()
                 }

core/src/main/java/io/github/thibaultbee/streampack/core/elements/sources/video/camera/controllers/CameraDeviceController.kt

@@ -103,9 +103,8 @@ internal class CameraDeviceController private constructor(
                 return@withLock
             }
             cameraDevice.close()
-            if (!isClosedFlow.value) {
-                isClosedFlow.first { it }
-            }
+            isClosedFlow.first { it }
+            Logger.d(TAG, "Camera $id closed")
         }
     }
 

core/src/main/java/io/github/thibaultbee/streampack/core/elements/sources/video/camera/controllers/CameraSessionController.kt

@@ -47,12 +47,13 @@ internal class CameraSessionController private constructor(
     private val captureSession: CameraCaptureSession,
     private val outputs: List<CameraSurface>,
     val dynamicRange: Long,
+    val cameraIsClosedFlow: StateFlow<Boolean>,
     val isClosedFlow: StateFlow<Boolean>
 ) {
     private val captureSessionMutex = Mutex()
 
     val isClosed: Boolean
-        get() = isClosedFlow.value
+        get() = isClosedFlow.value || cameraIsClosedFlow.value
 
     private val requestTargetMutex = Mutex()
 
@@ -82,8 +83,6 @@ internal class CameraSessionController private constructor(
     /**
      * Whether the current capture request has a target
      *
-     * The target must be in the current capture session, see [hasOutput].
-     *
      * @param surface The target to check
      * @return true if the target is in the current capture request, false otherwise
      */
@@ -96,8 +95,6 @@ internal class CameraSessionController private constructor(
     /**
      * Whether the current capture request has a target
      *
-     * The target must be in the current capture session, see [hasOutput].
-     *
      * @param cameraSurface The target to check
      * @return true if the target is in the current capture request, false otherwise
      */
@@ -242,10 +239,8 @@ internal class CameraSessionController private constructor(
                 }
                 try {
                     captureSession.close()
-
-                    if (!isClosedFlow.value) {
-                        isClosedFlow.first { it }
-                    }
+                    isClosedFlow.first { it }
+                    Logger.d(TAG, "Camera session closed")
                 } catch (t: Throwable) {
                     Logger.w(TAG, "Error closing camera session: $t")
                 }
@@ -422,6 +417,7 @@ internal class CameraSessionController private constructor(
                 newCaptureSession,
                 outputs,
                 dynamicRange,
+                cameraDeviceController.isClosedFlow,
                 isClosedFlow.asStateFlow()
             )
 
@@ -472,6 +468,7 @@ internal class CameraSessionController private constructor(
                 captureSession,
                 outputs,
                 dynamicRange,
+                cameraDeviceController.isClosedFlow,
                 isClosedFlow.asStateFlow()
             )
         }

core/src/main/java/io/github/thibaultbee/streampack/core/elements/sources/video/camera/utils/CaptureRequestWithTargetsBuilder.kt

@@ -20,6 +20,7 @@ import android.hardware.camera2.CaptureRequest
 import android.hardware.camera2.CaptureRequest.Builder
 import android.view.Surface
 import io.github.thibaultbee.streampack.core.elements.sources.video.camera.controllers.CameraDeviceController
+import io.github.thibaultbee.streampack.core.logger.Logger
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 

demos/camera/src/main/java/io/github/thibaultbee/streampack/app/ui/main/PreviewFragment.kt

@@ -193,17 +193,8 @@ class PreviewFragment : Fragment(R.layout.main_fragment) {
         }
 
         // Wait till streamer exists to set it to the SurfaceView.
-        preview.streamer = streamer
-        if (PermissionManager.hasPermissions(requireContext(), Manifest.permission.CAMERA)) {
-            lifecycleScope.launch {
-                try {
-                    preview.startPreview()
-                } catch (t: Throwable) {
-                    Log.e(TAG, "Error starting preview", t)
-                }
-            }
-        } else {
-            Log.e(TAG, "Camera permission not granted. Preview will not start.")
+        lifecycleScope.launch {
+            preview.setVideoSourceProvider(streamer)
         }
     }