fix(core): multiple small fixes to avoid potential bugs

ThibaultBee · Nov 16, 2023 · a13439e · a13439e
1 parent 0626392
commit a13439e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/encoders/MediaCodecEncoder.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/encoders/MediaCodecEncoder.kt
@@ -230,8 +230,12 @@ abstract class MediaCodecEncoder<T : Config>(
     }
 
     override fun release() {
-        mediaCodec?.release()
-        mediaCodec = null
+        try {
+            mediaCodec?.release()
+        } catch (_: Exception) {
+        } finally {
+            mediaCodec = null
+        }
     }
 
     companion object {

diff --git a/...rc/main/java/io/github/thibaultbee/streampack/internal/encoders/VideoMediaCodecEncoder.kt b/...rc/main/java/io/github/thibaultbee/streampack/internal/encoders/VideoMediaCodecEncoder.kt
@@ -45,7 +45,7 @@ class VideoMediaCodecEncoder(
     private val orientationProvider: ISourceOrientationProvider?
 ) :
     MediaCodecEncoder<VideoConfig>(encoderListener) {
-    var codecSurface = if (useSurfaceMode) {
+    val codecSurface = if (useSurfaceMode) {
         CodecSurface(orientationProvider)
     } else {
         null

diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/endpoints/FileWriter.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/endpoints/FileWriter.kt
@@ -25,8 +25,11 @@ import java.io.OutputStream
 class FileWriter : IEndpoint {
     var file: File? = null
         set(value) {
-            value?.let {
-                outputStream = FileOutputStream(value, false)
+            outputStream = if (value != null) {
+                FileOutputStream(value, false)
+            } else {
+                outputStream?.close()
+                null
             }
             field = value
         }

diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/utils/Scheduler.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/utils/Scheduler.kt
@@ -25,6 +25,9 @@ class Scheduler(
     private var job: Job? = null
 
     fun start() {
+        if (job != null) {
+            return
+        }
         job = coroutineScope.launch {
             while (true) {
                 delay(delayTimeMillis)
@@ -35,5 +38,6 @@ class Scheduler(
 
     fun cancel() {
         job?.cancel()
+        job = null
     }
 }