refactor(*): backport streamer interfaces from next version

Author: ThibaultBee

core/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/file/CameraStreamerFileTest.kt

@@ -36,7 +36,6 @@ import io.github.thibaultbee.streampack.core.elements.endpoints.composites.sinks
 import io.github.thibaultbee.streampack.core.streamers.single.AudioConfig
 import io.github.thibaultbee.streampack.core.streamers.single.CameraSingleStreamer
 import io.github.thibaultbee.streampack.core.streamers.single.VideoConfig
-import io.github.thibaultbee.streampack.core.streamers.single.setConfig
 import io.github.thibaultbee.streampack.core.utils.FileUtils
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule

…er/file/CameraStreamerMultiStreamTest.kt …/file/CameraStreamerMultiEndpointTest.ktcore/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/file/CameraStreamerMultiStreamTest.kt renamed to core/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/file/CameraStreamerMultiEndpointTest.kt core/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/file/CameraStreamerMultiStreamTest.kt renamed to core/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/file/CameraStreamerMultiEndpointTest.kt

@@ -28,7 +28,6 @@ import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.UriMe
 import io.github.thibaultbee.streampack.core.streamers.single.AudioConfig
 import io.github.thibaultbee.streampack.core.streamers.single.CameraSingleStreamer
 import io.github.thibaultbee.streampack.core.streamers.single.VideoConfig
-import io.github.thibaultbee.streampack.core.streamers.single.setConfig
 import io.github.thibaultbee.streampack.core.utils.FileUtils
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -40,7 +39,7 @@ import kotlin.time.Duration.Companion.seconds
  * Test [CameraSingleStreamer] with multiple streams.
  */
 @LargeTest
-class CameraStreamerMultiStreamTest {
+class CameraStreamerMultiEndpointTest {
     private val context: Context = InstrumentationRegistry.getInstrumentation().context
     private val streamer = CameraSingleStreamer(context)
 

core/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/file/StreamerUtils.kt

@@ -24,7 +24,7 @@ object StreamerUtils {
             while (i < numOfLoop) {
                 i++
                 delay(pollDuration)
-                assertTrue(streamer.isStreaming.value)
+                assertTrue(streamer.isStreamingFlow.value)
             }
         }
         streamer.stopStream()

core/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/state/AudioOnlyStreamerStateTest.kt

@@ -23,7 +23,6 @@ import androidx.test.rule.GrantPermissionRule
 import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.MediaDescriptor
 import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.UriMediaDescriptor
 import io.github.thibaultbee.streampack.core.streamers.single.AudioOnlySingleStreamer
-import io.github.thibaultbee.streampack.core.streamers.single.setConfig
 import io.github.thibaultbee.streampack.core.streamers.single.startStream
 import io.github.thibaultbee.streampack.core.utils.ConfigurationUtils
 import io.github.thibaultbee.streampack.core.utils.FileUtils
@@ -55,14 +54,14 @@ class AudioOnlyStreamerStateTest(private val descriptor: MediaDescriptor) {
 
     // Single method calls
     @Test
-    fun configureAudioOnlyTest() {
+    fun configureAudioOnlyTest() = runTest {
         streamer.setAudioConfig(
             ConfigurationUtils.dummyValidAudioConfig()
         )
     }
 
     @Test
-    fun configureVideoOnlyTest() {
+    fun configureVideoOnlyTest() = runTest {
         try {
             streamer.setVideoConfig(
                 ConfigurationUtils.dummyValidVideoConfig()
@@ -73,7 +72,7 @@ class AudioOnlyStreamerStateTest(private val descriptor: MediaDescriptor) {
     }
 
     @Test
-    fun configureTest() {
+    fun configureTest() = runTest {
         try {
             streamer.setConfig(
                 ConfigurationUtils.dummyValidAudioConfig(),
@@ -85,7 +84,7 @@ class AudioOnlyStreamerStateTest(private val descriptor: MediaDescriptor) {
     }
 
     @Test
-    fun configureErrorTest() {
+    fun configureErrorTest() = runTest {
         try {
             streamer.setAudioConfig(
                 ConfigurationUtils.dummyInvalidAudioConfig()
@@ -105,7 +104,7 @@ class AudioOnlyStreamerStateTest(private val descriptor: MediaDescriptor) {
     }
 
     @Test
-    fun configureReleaseTest() {
+    fun configureReleaseTest() = runTest {
         streamer.setAudioConfig(
             ConfigurationUtils.dummyValidAudioConfig()
         )
@@ -151,7 +150,7 @@ class AudioOnlyStreamerStateTest(private val descriptor: MediaDescriptor) {
     }
 
     @Test
-    fun multipleConfigureTest() {
+    fun multipleConfigureTest() = runTest {
         (0..10).forEach { _ ->
             streamer.setAudioConfig(
                 ConfigurationUtils.dummyValidAudioConfig()

core/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/state/CameraStreamerStateTest.kt

@@ -27,7 +27,6 @@ import io.github.thibaultbee.streampack.core.streamer.surface.SurfaceUtils
 import io.github.thibaultbee.streampack.core.streamer.surface.SurfaceViewTestActivity
 import io.github.thibaultbee.streampack.core.streamers.interfaces.startPreview
 import io.github.thibaultbee.streampack.core.streamers.single.CameraSingleStreamer
-import io.github.thibaultbee.streampack.core.streamers.single.setConfig
 import io.github.thibaultbee.streampack.core.streamers.single.startStream
 import io.github.thibaultbee.streampack.core.utils.ConfigurationUtils
 import io.github.thibaultbee.streampack.core.utils.FileUtils

core/src/androidTest/java/io/github/thibaultbee/streampack/core/streamer/state/StreamerStateTest.kt

@@ -16,8 +16,8 @@
 package io.github.thibaultbee.streampack.core.streamer.state
 
 import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.MediaDescriptor
-import io.github.thibaultbee.streampack.core.streamers.single.ICoroutineSingleStreamer
-import io.github.thibaultbee.streampack.core.streamers.single.setConfig
+import io.github.thibaultbee.streampack.core.streamers.interfaces.releaseBlocking
+import io.github.thibaultbee.streampack.core.streamers.single.SingleStreamer
 import io.github.thibaultbee.streampack.core.streamers.single.startStream
 import io.github.thibaultbee.streampack.core.utils.ConfigurationUtils
 import kotlinx.coroutines.test.runTest
@@ -28,11 +28,11 @@ import org.junit.Test
 abstract class StreamerStateTest(
     protected val descriptor: MediaDescriptor
 ) {
-    protected abstract val streamer: ICoroutineSingleStreamer
+    protected abstract val streamer: SingleStreamer
 
     @After
     open fun tearDown() {
-        streamer.release()
+        streamer.releaseBlocking()
     }
 
     @Test
@@ -48,29 +48,29 @@ abstract class StreamerStateTest(
 
     // Single method calls
     @Test
-    open fun configureAudioOnlyTest() {
+    open fun configureAudioOnlyTest() = runTest {
         streamer.setAudioConfig(
             ConfigurationUtils.dummyValidAudioConfig()
         )
     }
 
     @Test
-    open fun configureVideoOnlyTest() {
+    open fun configureVideoOnlyTest() = runTest {
         streamer.setVideoConfig(
             ConfigurationUtils.dummyValidVideoConfig()
         )
     }
 
     @Test
-    open fun configureTest() {
+    open fun configureTest() = runTest {
         streamer.setConfig(
             ConfigurationUtils.dummyValidAudioConfig(),
             ConfigurationUtils.dummyValidVideoConfig()
         )
     }
 
     @Test
-    open fun configureErrorTest() {
+    open fun configureErrorTest() = runTest {
         try {
             streamer.setConfig(
                 ConfigurationUtils.dummyInvalidAudioConfig(),
@@ -102,7 +102,7 @@ abstract class StreamerStateTest(
     }
 
     @Test
-    fun releaseTest() {
+    fun releaseTest() = runTest {
         streamer.release()
     }
 
@@ -117,7 +117,7 @@ abstract class StreamerStateTest(
     }
 
     @Test
-    open fun configureReleaseTest() {
+    open fun configureReleaseTest() = runTest {
         streamer.setConfig(
             ConfigurationUtils.dummyValidAudioConfig(),
             ConfigurationUtils.dummyValidVideoConfig()
@@ -156,7 +156,7 @@ abstract class StreamerStateTest(
 
     // Stress test
     @Test
-    open fun multipleConfigureTest() {
+    open fun multipleConfigureTest() = runTest {
         (0..10).forEach { _ ->
             streamer.setConfig(
                 ConfigurationUtils.dummyValidAudioConfig(),

core/src/main/java/io/github/thibaultbee/streampack/core/elements/endpoints/CombineEndpoint.kt

@@ -56,13 +56,13 @@ open class CombineEndpoint(protected val endpointInternals: List<IEndpointIntern
 
     /**
      * Whether at least one endpoint is open.
-     * This is a combination of all endpoints' [IEndpoint.isOpen].
+     * This is a combination of all endpoints' [IEndpoint.isOpenFlow].
      *
-     * To verify if a specific endpoint is open, use [IEndpoint.isOpen] of the endpoint.
+     * To verify if a specific endpoint is open, use [IEndpoint.isOpenFlow] of the endpoint.
      */
-    override val isOpen: StateFlow<Boolean> =
-        combineStates(*endpointInternals.map { it.isOpen }.toTypedArray()) { _ ->
-            endpointInternals.any { it.isOpen.value }
+    override val isOpenFlow: StateFlow<Boolean> =
+        combineStates(*endpointInternals.map { it.isOpenFlow }.toTypedArray()) { _ ->
+            endpointInternals.any { it.isOpenFlow.value }
         }
 
     /**
@@ -190,7 +190,7 @@ open class CombineEndpoint(protected val endpointInternals: List<IEndpointIntern
 
         endpointInternals.forEach { endpoint ->
             try {
-                if (endpoint.isOpen.value) {
+                if (endpoint.isOpenFlow.value) {
                     val endpointStreamId = endpointsToStreamIdsMap[Pair(endpoint, streamPid)]!!
                     endpoint.write(frame, endpointStreamId)
 

core/src/main/java/io/github/thibaultbee/streampack/core/elements/endpoints/DynamicEndpoint.kt

@@ -63,9 +63,9 @@ open class DynamicEndpoint(
     private var rtmpEndpoint: IEndpointInternal? = null
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    override val isOpen: StateFlow<Boolean> = DerivedStateFlow(
-        getValue = { _endpoint?.isOpen?.value ?: false },
-        flow = endpointFlow.flatMapLatest { it?.isOpen ?: MutableStateFlow(false) }
+    override val isOpenFlow: StateFlow<Boolean> = DerivedStateFlow(
+        getValue = { _endpoint?.isOpenFlow?.value ?: false },
+        flow = endpointFlow.flatMapLatest { it?.isOpenFlow ?: MutableStateFlow(false) }
     )
 
     /**
@@ -80,7 +80,7 @@ open class DynamicEndpoint(
         get() = endpoint.metrics
 
     override suspend fun open(descriptor: MediaDescriptor) {
-        if (isOpen.value) {
+        if (isOpenFlow.value) {
             Logger.w(TAG, "DynamicEndpoint is already opened")
             return
         }

core/src/main/java/io/github/thibaultbee/streampack/core/elements/endpoints/IEndpoint.kt

@@ -77,7 +77,7 @@ interface IEndpoint {
      * Whether if the endpoint is opened.
      * For example, if the file is opened for [FileSink].
      */
-    val isOpen: StateFlow<Boolean>
+    val isOpenFlow: StateFlow<Boolean>
 
     /**
      * A info to verify supported formats.

core/src/main/java/io/github/thibaultbee/streampack/core/elements/endpoints/MediaMuxerEndpoint.kt

@@ -61,11 +61,11 @@ class MediaMuxerEndpoint(
     override val metrics: Any
         get() = TODO("Not yet implemented")
 
-    private val _isOpen = MutableStateFlow(false)
-    override val isOpen: StateFlow<Boolean> = _isOpen
+    private val _isOpenFlow = MutableStateFlow(false)
+    override val isOpenFlow: StateFlow<Boolean> = _isOpenFlow
 
     override suspend fun open(descriptor: MediaDescriptor) {
-        if (isOpen.value) {
+        if (isOpenFlow.value) {
             Logger.w(TAG, "MediaMuxerEndpoint is already opened")
             return
         }
@@ -121,7 +121,7 @@ class MediaMuxerEndpoint(
             throw t
         }
 
-        _isOpen.emit(true)
+        _isOpenFlow.emit(true)
     }
 
     override suspend fun write(
@@ -209,7 +209,7 @@ class MediaMuxerEndpoint(
             numOfStreams = 0
             streamIdToTrackId.clear()
             mediaMuxer = null
-            _isOpen.emit(false)
+            _isOpenFlow.emit(false)
         }
     }