throw error on submit if necessary

pedroSG94 · Oct 14, 2024 · 5428aac · 5428aac
1 parent f0b9aa3
commit 5428aac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/common/src/main/java/com/pedro/common/Extensions.kt b/common/src/main/java/com/pedro/common/Extensions.kt
@@ -37,6 +37,7 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.ThreadPoolExecutor
 import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
 import kotlin.coroutines.Continuation
 
 /**
@@ -100,7 +101,10 @@ fun ExecutorService.secureSubmit(timeout: Long = 5000, code: () -> Unit) {
     if (isTerminated || isShutdown) return
     submit { code() }.get(timeout, TimeUnit.MILLISECONDS)
   } catch (e: Exception) {
-    Log.e("ExecutorService", "secureSubmit Error", e)
+    when (e) {
+      is InterruptedException, is TimeoutException -> {}
+      else -> throw e
+    }
   }
 }
 

diff --git a/library/src/main/java/com/pedro/library/view/GlStreamInterface.kt b/library/src/main/java/com/pedro/library/view/GlStreamInterface.kt
@@ -141,7 +141,6 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
 
   override fun start() {
     threadQueue.clear()
-    mainRender.release()
     val executor = newSingleThreadExecutor(threadQueue)
     executor.secureSubmit {
       surfaceManager.release()
@@ -167,6 +166,7 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
       surfaceManagerPhoto.release()
       surfaceManagerEncoder.release()
       surfaceManager.release()
+      mainRender.release()
     }
     executor?.shutdownNow()
     executor = null

diff --git a/library/src/main/java/com/pedro/library/view/OpenGlView.java b/library/src/main/java/com/pedro/library/view/OpenGlView.java
@@ -307,7 +307,6 @@ public void removeMediaCodecSurface() {
   @Override
   public void start() {
     threadQueue.clear();
-    mainRender.release();
     ExecutorService executor = ExtensionsKt.newSingleThreadExecutor(threadQueue);
     ExtensionsKt.secureSubmit(executor, () -> {
       surfaceManager.release();
@@ -338,6 +337,7 @@ public void stop() {
       surfaceManagerPhoto.release();
       surfaceManagerEncoder.release();
       surfaceManager.release();
+      mainRender.release();
       return null;
     });
     executor.shutdownNow();