WIP

Author: ThibaultBee

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

@@ -133,14 +133,23 @@ 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")
         }
         Logger.e(TAG, ">>> Set preview $surface")
         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() {
         Logger.e(TAG, ">>> reset preview")
@@ -195,7 +204,6 @@ internal class CameraSource(
     private suspend fun startPreviewUnsafe() {
         if (isPreviewingFlow.value) {
             Logger.w(TAG, "Camera is already previewing")
-            return
         }
         Logger.w(TAG, "Add preview to controller")
         controller.addTarget(PREVIEW_NAME)
@@ -219,11 +227,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()
             }
         }