|
@@ -431,8 +431,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
}
|
|
|
cUtil.cmd("chomd -R 777 " + file.getParentFile().getPath());
|
|
|
log.info("newfilePath:{}", newfilePath);
|
|
|
-
|
|
|
- List<String> validFileList = new ArrayList<>();
|
|
|
+
|
|
|
StringBuilder argFileTxt = new StringBuilder();
|
|
|
fromVideoFileList.forEach(filePath -> {
|
|
|
File videoFile = new File(filePath);
|
|
@@ -441,16 +440,14 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
}
|
|
|
log.info("file:{}", filePath);
|
|
|
|
|
|
- validFileList.add(filePath);
|
|
|
-
|
|
|
argFileTxt.append("file '").append(filePath).append("'").append(System.lineSeparator());
|
|
|
});
|
|
|
|
|
|
- if (!flay) {
|
|
|
- validFileList.add(newfilePath);
|
|
|
- }
|
|
|
-
|
|
|
- putDeleteCache(validFileList);
|
|
|
+// if (!flay) {
|
|
|
+// List<String> validFileList = new ArrayList<>();
|
|
|
+// validFileList.add(newfilePath);
|
|
|
+// putDeleteCache(validFileList);
|
|
|
+// }
|
|
|
|
|
|
if (argFileTxt.length() == 0) {
|
|
|
return;
|