|
|
@ -377,15 +377,10 @@ class VideoHandleActivity : BaseActivity() { |
|
|
|
Log.e(TAG, "width=$width--height=$height") |
|
|
|
Log.e(TAG, "width=$width--height=$height") |
|
|
|
} |
|
|
|
} |
|
|
|
val transformCmd2 = FFmpegUtil.transformVideoWithEncode(appendPath, width, height, outputPath2) |
|
|
|
val transformCmd2 = FFmpegUtil.transformVideoWithEncode(appendPath, width, height, outputPath2) |
|
|
|
val fileList = ArrayList<String>() |
|
|
|
val fileList = listOf(outputPath1, outputPath2) |
|
|
|
fileList.add(outputPath1) |
|
|
|
|
|
|
|
fileList.add(outputPath2) |
|
|
|
|
|
|
|
FileUtil.createListFile(listPath, fileList) |
|
|
|
FileUtil.createListFile(listPath, fileList) |
|
|
|
val jointVideoCmd = FFmpegUtil.jointVideo(listPath, targetPath) |
|
|
|
val jointVideoCmd = FFmpegUtil.jointVideo(listPath, targetPath) |
|
|
|
val commandList = ArrayList<Array<String>>() |
|
|
|
val commandList = listOf(transformCmd1, transformCmd2, jointVideoCmd) |
|
|
|
commandList.add(transformCmd1) |
|
|
|
|
|
|
|
commandList.add(transformCmd2) |
|
|
|
|
|
|
|
commandList.add(jointVideoCmd) |
|
|
|
|
|
|
|
ffmpegHandler!!.executeFFmpegCmds(commandList) |
|
|
|
ffmpegHandler!!.executeFFmpegCmds(commandList) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|