feat(core): streamer: make startStream suspendable as it can call net…

…work
ThibaultBee · Nov 27, 2023 · e188f44 · e188f44
1 parent 594af7f
commit e188f44
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.../main/java/io/github/thibaultbee/streampack/streamers/bases/BaseScreenRecorderStreamer.kt b/.../main/java/io/github/thibaultbee/streampack/streamers/bases/BaseScreenRecorderStreamer.kt
@@ -91,7 +91,7 @@ open class BaseScreenRecorderStreamer(
      * Same as [BaseStreamer] but it prepares [ScreenSource.encoderSurface].
      * You must have set [activityResult] before.
      */
-    override fun startStream() {
+    override suspend fun startStream() {
         screenSource.encoderSurface = videoEncoder?.inputSurface
         super.startStream()
     }

diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseStreamer.kt
@@ -272,7 +272,7 @@ abstract class BaseStreamer(
      *
      * @see [stopStream]
      */
-    override fun startStream() {
+    override suspend fun startStream() {
         try {
             endpoint.startStream()
 

diff --git a/...rc/main/java/io/github/thibaultbee/streampack/streamers/file/BaseAudioOnlyFileStreamer.kt b/...rc/main/java/io/github/thibaultbee/streampack/streamers/file/BaseAudioOnlyFileStreamer.kt
@@ -96,5 +96,5 @@ open class BaseAudioOnlyFileStreamer(
      * Manifest.permission.WRITE_EXTERNAL_STORAGE.
      */
     @RequiresPermission(allOf = [Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO])
-    override fun startStream() = super.startStream()
+    override suspend fun startStream() = super.startStream()
 }
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/file/BaseCameraFileStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/file/BaseCameraFileStreamer.kt
@@ -98,5 +98,5 @@ open class BaseCameraFileStreamer(
      * Manifest.permission.WRITE_EXTERNAL_STORAGE.
      */
     @RequiresPermission(allOf = [Manifest.permission.WRITE_EXTERNAL_STORAGE])
-    override fun startStream() = super.startStream()
+    override suspend fun startStream() = super.startStream()
 }
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/interfaces/IStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/interfaces/IStreamer.kt
@@ -81,7 +81,7 @@ interface IStreamer {
      *
      * @see [stopStream]
      */
-    fun startStream()
+    suspend fun startStream()
 
     /**
      * Stops audio/video stream.

diff --git a/...src/main/java/io/github/thibaultbee/streampack/ext/srt/streamers/CameraSrtLiveStreamer.kt b/...src/main/java/io/github/thibaultbee/streampack/ext/srt/streamers/CameraSrtLiveStreamer.kt
@@ -147,7 +147,7 @@ class CameraSrtLiveStreamer(
     /**
      * Same as [BaseCameraLiveStreamer.startStream] but also starts bitrate regulator.
      */
-    override fun startStream() {
+    override suspend fun startStream() {
         if (bitrateRegulator != null) {
             scheduler.start()
         }

diff --git a/.../java/io/github/thibaultbee/streampack/ext/srt/streamers/ScreenRecorderSrtLiveStreamer.kt b/.../java/io/github/thibaultbee/streampack/ext/srt/streamers/ScreenRecorderSrtLiveStreamer.kt
@@ -153,7 +153,7 @@ class ScreenRecorderSrtLiveStreamer(
     /**
      * Same as [BaseScreenRecorderLiveStreamer.startStream] but also starts bitrate regulator.
      */
-    override fun startStream() {
+    override suspend fun startStream() {
         if (bitrateRegulator != null) {
             scheduler.start()
         }