Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-18 23:05:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix ffmpeg

Browse Source
This commit is contained in:
Myzel394 2023-11-30 23:20:48 +01:00
parent 0d618380fa
commit 3cee858b56
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
View File

@ -138,14 +138,15 @@ abstract class BatchesFolder(
filePaths, filePaths,
outputFile, outputFile,
parameter, parameter,
) ).await()
return outputFile
} catch (e: MediaConverter.FFmpegException) { } catch (e: MediaConverter.FFmpegException) {
continue continue
} }
} }
} }
return outputFile throw MediaConverter.FFmpegException("Failed to concatenate")
} }
fun exportFolderForSettings(): String { fun exportFolderForSettings(): String {

5
app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt
View File

@ -70,13 +70,16 @@ class MediaConverter {
" -safe 0" + " -safe 0" +
" -i ${listFile.absolutePath}" + " -i ${listFile.absolutePath}" +
extraCommand + extraCommand +
" -strict normal" +
" -y" + " -y" +
" $outputFile" " $outputFile"
FFmpegKit.executeAsync( FFmpegKit.executeAsync(
command command
) { session -> ) { session ->
listFile.delete() runCatching {
listFile.delete()
}
if (!ReturnCode.isSuccess(session!!.returnCode)) { if (!ReturnCode.isSuccess(session!!.returnCode)) {
Log.d( Log.d(