From 0d618380fa642cf135e4c782fc840174c9dfbc3d Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Wed, 29 Nov 2023 19:02:32 +0100 Subject: [PATCH] current stand: trying to improve concatenation of file --- app/build.gradle | 2 +- .../main/java/app/myzel394/alibi/helpers/BatchesFolder.kt | 2 ++ .../main/java/app/myzel394/alibi/helpers/MediaConverter.kt | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8f5b385..4d282bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,7 +119,7 @@ dependencies { annotationProcessor 'com.google.dagger:hilt-compiler:2.46.1' implementation "androidx.hilt:hilt-navigation-compose:1.1.0" - implementation 'com.arthenica:ffmpeg-kit-min-gpl:5.1' + implementation 'com.arthenica:ffmpeg-kit-full-gpl:5.1' implementation "androidx.datastore:datastore-preferences:1.0.0" 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 3eb187f..6582d86 100644 --- a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt +++ b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt @@ -7,6 +7,7 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter import com.arthenica.ffmpegkit.FFmpegKitConfig import android.os.ParcelFileDescriptor +import android.util.Log import kotlinx.coroutines.CompletableDeferred import java.io.FileDescriptor import kotlin.reflect.KFunction3 @@ -129,6 +130,7 @@ abstract class BatchesFolder( val filePaths = getBatchesForFFmpeg() for (parameter in ffmpegParameters) { + Log.i("Concatenation", "Trying parameter $parameter") onNextParameterTry(parameter) try { 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 d45d95e..7d73732 100644 --- a/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt +++ b/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt @@ -49,9 +49,9 @@ class MediaConverter { } private fun createTempFile(content: String): File { - val name = UUID.randomUUID().toString() + val id = UUID.randomUUID().toString() - return File.createTempFile("temp-$name", ".txt").apply { + return File.createTempFile(".temp-ffmpeg-files-$id", ".txt").apply { writeText(content) } } @@ -63,7 +63,7 @@ class MediaConverter { ): CompletableDeferred { val completer = CompletableDeferred() - val listFile = createTempFile(inputFiles.joinToString("\n", prefix = "file ")) + val listFile = createTempFile(inputFiles.joinToString("\n") { "file '$it'" }) val command = " -f concat" +