Dev v3 2

build.gradle.kts

@@ -5,11 +5,11 @@ plugins {
 }
 
 allprojects {
-    val versionCode by extra { 3_001_000 }
-    val versionName by extra { "3.1.0" }
+    val versionCode by extra { 3_002_000 }
+    val versionName by extra { "3.2.0" }
 
     group = "io.github.thibaultbee.streampack"
-    version = versionName
+    version = "$versionName-SNAPSHOT"
 }
 
 dependencies {

core/src/androidTest/java/io/github/thibaultbee/streampack/core/elements/sources/StubAudioSource.kt

@@ -1,12 +1,11 @@
 package io.github.thibaultbee.streampack.core.elements.sources
 
 import android.content.Context
-import io.github.thibaultbee.streampack.core.elements.data.RawFrame
 import io.github.thibaultbee.streampack.core.elements.sources.audio.AudioSourceConfig
 import io.github.thibaultbee.streampack.core.elements.sources.audio.IAudioSourceInternal
-import io.github.thibaultbee.streampack.core.elements.utils.pool.IReadOnlyRawFrameFactory
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import java.nio.ByteBuffer
 
 class StubAudioSource : IAudioSourceInternal {
     private val _isStreamingFlow = MutableStateFlow(false)
@@ -15,13 +14,11 @@ class StubAudioSource : IAudioSourceInternal {
     private val _configurationFlow = MutableStateFlow<AudioSourceConfig?>(null)
     val configurationFlow = _configurationFlow.asStateFlow()
 
-    override fun fillAudioFrame(frame: RawFrame): RawFrame {
-        return frame
+    override val minBufferSize = 0
+    override fun fillAudioFrame(buffer: ByteBuffer): Long {
+        return 0L
     }
 
-    override fun getAudioFrame(frameFactory: IReadOnlyRawFrameFactory) =
-        frameFactory.create(8192, 0)
-
     override suspend fun startStream() {
         _isStreamingFlow.value = true
     }

core/src/androidTest/java/io/github/thibaultbee/streampack/core/elements/sources/StubVideoSource.kt

@@ -8,12 +8,12 @@ import io.github.thibaultbee.streampack.core.elements.sources.video.ISurfaceSour
 import io.github.thibaultbee.streampack.core.elements.sources.video.IVideoFrameSourceInternal
 import io.github.thibaultbee.streampack.core.elements.sources.video.IVideoSourceInternal
 import io.github.thibaultbee.streampack.core.elements.sources.video.VideoSourceConfig
-import io.github.thibaultbee.streampack.core.elements.utils.pool.IReadOnlyRawFrameFactory
 import io.github.thibaultbee.streampack.core.elements.utils.time.Timebase
 import io.github.thibaultbee.streampack.core.pipelines.IVideoDispatcherProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import java.nio.ByteBuffer
 
 class StubVideoSurfaceSource(override val timebase: Timebase = Timebase.REALTIME) :
     StubVideoSource(),
@@ -44,8 +44,9 @@ class StubVideoSurfaceSource(override val timebase: Timebase = Timebase.REALTIME
 }
 
 class StubVideoFrameSource : StubVideoSource(), IVideoFrameSourceInternal {
-    override fun getVideoFrame(frameFactory: IReadOnlyRawFrameFactory) =
-        frameFactory.create(8192, 0L)
+    override fun getVideoFrame(buffer: ByteBuffer): Long {
+        return 0L
+    }
 
     class Factory : IVideoSourceInternal.Factory {
         override suspend fun create(

core/src/androidTest/java/io/github/thibaultbee/streampack/core/pipelines/StreamerPipelineTest.kt

@@ -83,8 +83,8 @@ class StreamerPipelineTest {
         )
         streamerPipeline.addOutput(output)
 
-        val audioSource = streamerPipeline.audioInput?.sourceFlow?.value as IAudioSourceInternal
-        val videoSource = streamerPipeline.videoInput?.sourceFlow?.value as IVideoSourceInternal
+        val audioSource = streamerPipeline.audioInput.sourceFlow.value as IAudioSourceInternal
+        val videoSource = streamerPipeline.videoInput.sourceFlow.value as IVideoSourceInternal
 
         streamerPipeline.startStream()
         assertTrue(streamerPipeline.isStreamingFlow.first { it })

core/src/androidTest/java/io/github/thibaultbee/streampack/core/pipelines/outputs/encoding/EncodingPipelineOutputTest.kt

@@ -20,7 +20,7 @@ import android.util.Log
 import androidx.core.net.toFile
 import androidx.test.platform.app.InstrumentationRegistry
 import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.UriMediaDescriptor
-import io.github.thibaultbee.streampack.core.elements.data.RawFrame
+import io.github.thibaultbee.streampack.core.elements.data.MutableRawFrame
 import io.github.thibaultbee.streampack.core.elements.encoders.AudioCodecConfig
 import io.github.thibaultbee.streampack.core.elements.encoders.VideoCodecConfig
 import io.github.thibaultbee.streampack.core.elements.endpoints.DummyEndpoint
@@ -317,7 +317,7 @@ class EncodingPipelineOutputTest {
 
         try {
             output.queueAudioFrame(
-                RawFrame(
+                MutableRawFrame(
                     ByteBuffer.allocateDirect(16384),
                     Random.nextLong()
                 )
@@ -330,14 +330,11 @@ class EncodingPipelineOutputTest {
         output.startStream(descriptor)
 
         output.queueAudioFrame(
-            RawFrame(
+            MutableRawFrame(
                 ByteBuffer.allocateDirect(16384),
                 Random.nextLong()
             )
         )
-
-        // Wait for frame to be received
-        assertNotNull(dummyEndpoint.frameFlow.filterNotNull().first())
     }
 
     companion object {

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

@@ -28,6 +28,7 @@ import io.github.thibaultbee.streampack.core.streamer.dual.utils.DualStreamerCon
 import io.github.thibaultbee.streampack.core.streamer.utils.StreamerUtils
 import io.github.thibaultbee.streampack.core.streamer.utils.VideoUtils
 import io.github.thibaultbee.streampack.core.streamers.dual.cameraDualStreamer
+import io.github.thibaultbee.streampack.core.streamers.dual.setConfig
 import io.github.thibaultbee.streampack.core.utils.DeviceTest
 import io.github.thibaultbee.streampack.core.utils.FileUtils
 import kotlinx.coroutines.runBlocking

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

@@ -28,6 +28,7 @@ import io.github.thibaultbee.streampack.core.streamer.single.utils.SingleStreame
 import io.github.thibaultbee.streampack.core.streamer.utils.StreamerUtils
 import io.github.thibaultbee.streampack.core.streamer.utils.VideoUtils
 import io.github.thibaultbee.streampack.core.streamers.single.cameraSingleStreamer
+import io.github.thibaultbee.streampack.core.streamers.single.setConfig
 import io.github.thibaultbee.streampack.core.utils.DeviceTest
 import io.github.thibaultbee.streampack.core.utils.FileUtils
 import kotlinx.coroutines.runBlocking

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

@@ -27,6 +27,7 @@ import io.github.thibaultbee.streampack.core.streamer.utils.VideoUtils
 import io.github.thibaultbee.streampack.core.streamers.single.AudioConfig
 import io.github.thibaultbee.streampack.core.streamers.single.VideoConfig
 import io.github.thibaultbee.streampack.core.streamers.single.cameraSingleStreamer
+import io.github.thibaultbee.streampack.core.streamers.single.setConfig
 import io.github.thibaultbee.streampack.core.utils.DeviceTest
 import io.github.thibaultbee.streampack.core.utils.FileUtils
 import kotlinx.coroutines.runBlocking

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

@@ -30,6 +30,7 @@ import io.github.thibaultbee.streampack.core.streamer.surface.SurfaceViewTestAct
 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.runBlocking
 import kotlinx.coroutines.test.runTest

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

@@ -22,6 +22,7 @@ import io.github.thibaultbee.streampack.core.interfaces.startStream
 import io.github.thibaultbee.streampack.core.streamers.single.AudioConfig
 import io.github.thibaultbee.streampack.core.streamers.single.SingleStreamer
 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.DeviceTest
 import kotlinx.coroutines.test.runTest
 import org.junit.After

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

@@ -4,7 +4,7 @@ import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.Media
 import io.github.thibaultbee.streampack.core.interfaces.ICloseableStreamer
 import io.github.thibaultbee.streampack.core.interfaces.startStream
 import io.github.thibaultbee.streampack.core.streamers.dual.DualStreamer
-import io.github.thibaultbee.streampack.core.streamers.single.SingleStreamer
+import io.github.thibaultbee.streampack.core.streamers.single.ISingleStreamer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
@@ -14,7 +14,7 @@ import kotlin.time.Duration.Companion.seconds
 
 object StreamerUtils {
     suspend fun runSingleStream(
-        streamer: SingleStreamer,
+        streamer: ISingleStreamer,
         descriptor: MediaDescriptor,
         duration: Duration,
         pollDuration: Duration = 1.seconds