diff --git a/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.kt b/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.kt index 30e8233..1cb6952 100644 --- a/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.kt +++ b/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.kt @@ -377,15 +377,10 @@ class VideoHandleActivity : BaseActivity() { Log.e(TAG, "width=$width--height=$height") } val transformCmd2 = FFmpegUtil.transformVideoWithEncode(appendPath, width, height, outputPath2) - val fileList = ArrayList() - fileList.add(outputPath1) - fileList.add(outputPath2) + val fileList = listOf(outputPath1, outputPath2) FileUtil.createListFile(listPath, fileList) val jointVideoCmd = FFmpegUtil.jointVideo(listPath, targetPath) - val commandList = ArrayList>() - commandList.add(transformCmd1) - commandList.add(transformCmd2) - commandList.add(jointVideoCmd) + val commandList = listOf(transformCmd1, transformCmd2, jointVideoCmd) ffmpegHandler!!.executeFFmpegCmds(commandList) } diff --git a/app/src/main/java/com/frank/ffmpeg/util/FFmpegUtil.java b/app/src/main/java/com/frank/ffmpeg/util/FFmpegUtil.java index 14306ca..4a30fcc 100644 --- a/app/src/main/java/com/frank/ffmpeg/util/FFmpegUtil.java +++ b/app/src/main/java/com/frank/ffmpeg/util/FFmpegUtil.java @@ -354,7 +354,7 @@ public class FFmpegUtil { */ public static String[] jointVideo(String fileListPath, String outputPath) { // ffmpeg -f concat -safe 0 -i %s -c copy %s - String jointVideoCmd = "ffmpeg -f concat -safe 0 -i file.txt -c copy %s"; + String jointVideoCmd = "ffmpeg -f concat -safe 0 -i -c copy -y"; return insert(jointVideoCmd.split(" "), 6, fileListPath, outputPath); }