From 7e9588a9e5294048c9acac0f9ab328a82eaec7ed Mon Sep 17 00:00:00 2001 From: Brage Date: Mon, 24 Jul 2023 02:43:53 +0200 Subject: [PATCH] Updated --- .../streamit/content/encode/runner/EncodeDaemon.kt | 2 +- .../content/encode/runner/RunnerCoordinator.kt | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt index f604c4fd..96082018 100644 --- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt +++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt @@ -21,7 +21,7 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte val progress = decoder.parseVideoProgress(items) if (progress != null) { daemonInterface.onProgress(referenceId, work, progress) - //outputCache.clear() + outputCache.clear() } } catch (e: Exception) { //logger.error { e.message } diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt index b2accbd5..8e06db01 100644 --- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt +++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt @@ -25,15 +25,7 @@ class RunnerCoordinator { val producer = DefaultProducer(CommonConfig.kafkaTopic) - val encodeExecutor: ExecutorService = ThreadPoolExecutor( - EncodeEnv.maxRunners, - EncodeEnv.maxRunners, - 0L, - TimeUnit.MILLISECONDS, - LinkedBlockingQueue() - ) - - val extractExecutor: ExecutorService = ThreadPoolExecutor( + val executor: ExecutorService = ThreadPoolExecutor( EncodeEnv.maxRunners, EncodeEnv.maxRunners, 0L, @@ -42,7 +34,7 @@ class RunnerCoordinator { ) fun addEncodeMessageToQueue(message: Message) { - encodeExecutor.execute { + executor.execute { try { runBlocking { if (message.data != null && message.data is EncodeWork) { @@ -64,7 +56,7 @@ class RunnerCoordinator { } fun addExtractMessageToQueue(message: Message) { - extractExecutor.execute { + executor.execute { runBlocking { try { if (message.data != null && message.data is ExtractWork) {