fix(core): fix concurrent access on outputSurfaces when releasing sur…

…faceprocessor
ThibaultBee · Nov 30, 2024 · 5295371 · 5295371
1 parent eb99947
commit 5295371
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.../java/io/github/thibaultbee/streampack/core/internal/processing/video/SurfaceProcessor.kt b/.../java/io/github/thibaultbee/streampack/core/internal/processing/video/SurfaceProcessor.kt
@@ -15,8 +15,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 class SurfaceProcessor(
     val dynamicRangeProfile: DynamicRangeProfile
-) : ISurfaceProcessorInternal,
-    SurfaceTexture.OnFrameAvailableListener {
+) : ISurfaceProcessorInternal, SurfaceTexture.OnFrameAvailableListener {
     private val renderer = OpenGlRenderer()
 
     private val isReleaseRequested = AtomicBoolean(false)
@@ -147,8 +146,8 @@ class SurfaceProcessor(
         if (isReleased && surfaceInputs.isEmpty()) {
             // Once release is called, we can stop sending frame to output surfaces.
             surfaceOutputs.forEach { it.close() }
+            removeAllOutputSurfaces()
 
-            surfaceOutputs.clear()
             renderer.release()
             glThread.quit()
         }
@@ -184,9 +183,7 @@ class SurfaceProcessor(
     }
 
     private fun <T> executeSafely(
-        block: () -> T,
-        onSuccess: ((T) -> Unit),
-        onError: ((Throwable) -> Unit)
+        block: () -> T, onSuccess: ((T) -> Unit), onError: ((Throwable) -> Unit)
     ) {
         try {
             glHandler.post {

diff --git a/core/src/main/java/io/github/thibaultbee/streampack/core/streamers/DefaultStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/core/streamers/DefaultStreamer.kt
@@ -672,7 +672,7 @@ open class DefaultStreamer(
         // Sources
         audioSourceInternal?.release()
         videoSourceInternal?.release()
-        surfaceProcessor?.removeAllOutputSurfaces()
+
         surfaceProcessor?.release()
 
         // Encoders