From 3cee858b56fb4270a9f274a9f43387277650730f Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Thu, 30 Nov 2023 23:20:48 +0100 Subject: [PATCH] fix: Fix ffmpeg --- .../main/java/app/myzel394/alibi/helpers/BatchesFolder.kt | 5 +++-- .../main/java/app/myzel394/alibi/helpers/MediaConverter.kt | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt index 6582d86..0525b10 100644 --- a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt +++ b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt @@ -138,14 +138,15 @@ abstract class BatchesFolder( filePaths, outputFile, parameter, - ) + ).await() + return outputFile } catch (e: MediaConverter.FFmpegException) { continue } } } - return outputFile + throw MediaConverter.FFmpegException("Failed to concatenate") } fun exportFolderForSettings(): String { diff --git a/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt b/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt index 7d73732..b438bc4 100644 --- a/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt +++ b/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt @@ -70,13 +70,16 @@ class MediaConverter { " -safe 0" + " -i ${listFile.absolutePath}" + extraCommand + + " -strict normal" + " -y" + " $outputFile" FFmpegKit.executeAsync( command ) { session -> - listFile.delete() + runCatching { + listFile.delete() + } if (!ReturnCode.isSuccess(session!!.returnCode)) { Log.d(