fix(core): fix concurrency exception due to camera source

ThibaultBee · Jan 8, 2025 · 2e4db6c · 2e4db6c
1 parent e395d6f
commit 2e4db6c
Show file tree

Hide file tree

Showing 14 changed files with 729 additions and 384 deletions.
diff --git a/...Test/java/io/github/thibaultbee/streampack/core/streamer/state/CameraStreamerStateTest.kt b/...Test/java/io/github/thibaultbee/streampack/core/streamer/state/CameraStreamerStateTest.kt
@@ -58,7 +58,7 @@ class CameraStreamerStateTest(descriptor: MediaDescriptor) :
             ConfigurationUtils.dummyValidAudioConfig(),
             ConfigurationUtils.dummyValidVideoConfig()
         )
-        streamer.startPreview(SurfaceUtils.createSurfaceView(activityScenarioRule.scenario))
+        streamer.startPreview(SurfaceUtils.getSurfaceView(activityScenarioRule.scenario))
         streamer.startStream(descriptor)
         streamer.stopStream()
         streamer.stopPreview()
@@ -68,17 +68,17 @@ class CameraStreamerStateTest(descriptor: MediaDescriptor) :
     // Single method calls
     @Test
     fun startPreviewTest() = runTest {
-        streamer.startPreview(SurfaceUtils.createSurfaceView(activityScenarioRule.scenario))
+        streamer.startPreview(SurfaceUtils.getSurfaceView(activityScenarioRule.scenario))
     }
 
     @Test
-    fun stopPreviewTest() {
+    fun stopPreviewTest() = runTest {
         streamer.stopPreview()
     }
 
     // Multiple methods calls
     @Test
-    fun configureStopPreviewTest() {
+    fun configureStopPreviewTest() = runTest {
         streamer.setConfig(
             ConfigurationUtils.dummyValidAudioConfig(),
             ConfigurationUtils.dummyValidVideoConfig()
@@ -92,7 +92,7 @@ class CameraStreamerStateTest(descriptor: MediaDescriptor) :
             ConfigurationUtils.dummyValidAudioConfig(),
             ConfigurationUtils.dummyValidVideoConfig()
         )
-        streamer.startPreview(SurfaceUtils.createSurfaceView(activityScenarioRule.scenario))
+        streamer.startPreview(SurfaceUtils.getSurfaceView(activityScenarioRule.scenario))
         streamer.release()
     }
 
@@ -102,7 +102,7 @@ class CameraStreamerStateTest(descriptor: MediaDescriptor) :
             ConfigurationUtils.dummyValidAudioConfig(),
             ConfigurationUtils.dummyValidVideoConfig()
         )
-        streamer.startPreview(SurfaceUtils.createSurfaceView(activityScenarioRule.scenario))
+        streamer.startPreview(SurfaceUtils.getSurfaceView(activityScenarioRule.scenario))
         streamer.stopPreview()
     }
 
@@ -112,13 +112,13 @@ class CameraStreamerStateTest(descriptor: MediaDescriptor) :
             ConfigurationUtils.dummyValidAudioConfig(),
             ConfigurationUtils.dummyValidVideoConfig()
         )
-        streamer.startPreview(SurfaceUtils.createSurfaceView(activityScenarioRule.scenario))
+        streamer.startPreview(SurfaceUtils.getSurfaceView(activityScenarioRule.scenario))
         streamer.stopStream()
     }
 
     @Test
     fun multipleStartPreviewStopPreviewTest() = runTest {
-        val surfaceView = SurfaceUtils.createSurfaceView(activityScenarioRule.scenario)
+        val surfaceView = SurfaceUtils.getSurfaceView(activityScenarioRule.scenario)
         streamer.setConfig(
             ConfigurationUtils.dummyValidAudioConfig(),
             ConfigurationUtils.dummyValidVideoConfig()

diff --git a/...c/androidTest/java/io/github/thibaultbee/streampack/core/streamer/surface/SurfaceUtils.kt b/...c/androidTest/java/io/github/thibaultbee/streampack/core/streamer/surface/SurfaceUtils.kt
@@ -24,7 +24,7 @@ import kotlin.coroutines.suspendCoroutine
 object SurfaceUtils {
     private const val TAG = "SurfaceUtils"
 
-    private fun createSurfaceViewAsync(
+    private fun getSurfaceViewAsync(
         scenario: ActivityScenario<SurfaceViewTestActivity>,
         onSurfaceCreated: (SurfaceView) -> Unit
     ) {
@@ -54,9 +54,56 @@ object SurfaceUtils {
         }
     }
 
-    suspend fun createSurfaceView(scenario: ActivityScenario<SurfaceViewTestActivity>): SurfaceView {
+    /**
+     * Gets the [SurfaceView] from the [SurfaceViewTestActivity]
+     */
+    suspend fun getSurfaceView(scenario: ActivityScenario<SurfaceViewTestActivity>): SurfaceView {
         return suspendCoroutine {
-            createSurfaceViewAsync(scenario) { surfaceView ->
+            getSurfaceViewAsync(scenario) { surfaceView ->
+                it.resumeWith(Result.success(surfaceView))
+            }
+        }
+    }
+
+    private fun addsSurfaceViewAsync(
+        scenario: ActivityScenario<SurfaceViewTestActivity>,
+        onSurfaceCreated: (SurfaceView) -> Unit
+    ) {
+        scenario.onActivity {
+            val surfaceView = SurfaceView(it)
+            val callback =
+                object : SurfaceHolder.Callback {
+                    override fun surfaceCreated(surfaceHolder: SurfaceHolder) {
+                        Logger.i(TAG, "Surface created")
+                        onSurfaceCreated(surfaceView)
+                    }
+
+                    override fun surfaceChanged(
+                        holder: SurfaceHolder,
+                        format: Int,
+                        width: Int,
+                        height: Int
+                    ) {
+                        Logger.i(TAG, "Surface changed")
+                    }
+
+                    override fun surfaceDestroyed(holder: SurfaceHolder) {
+                        Logger.i(TAG, "Surface destroyed")
+                    }
+                }
+
+
+            surfaceView.holder.setFixedSize(10, 10)
+            it.addSurface(surfaceView, callback)
+        }
+    }
+
+    /**
+     * Adds a [SurfaceView] in the [SurfaceViewTestActivity]
+     */
+    suspend fun addSurfaceView(scenario: ActivityScenario<SurfaceViewTestActivity>): SurfaceView {
+        return suspendCoroutine {
+            addsSurfaceViewAsync(scenario) { surfaceView ->
                 it.resumeWith(Result.success(surfaceView))
             }
         }