|
@@ -1,6 +1,6 @@
|
|
|
#!/bin/bash
|
|
|
|
|
|
-version="0.1.3"
|
|
|
+version="0.1.4"
|
|
|
videoFile=''
|
|
|
picFile=''
|
|
|
outputName=''
|
|
@@ -169,7 +169,7 @@ covertVideoTask() {
|
|
|
FFREPORT=file="$outputFolder/$outputName.$videoFileType.txt":level=48 \
|
|
|
ffmpeg -hide_banner -y -i $picFile -c:v libvpx -i $videoFile -filter_complex "[1:v][0:v]scale2ref[image][video];[video][image]overlay[v];[v]scale='2*trunc(iw/2)':'2*trunc(ih/2)'[v];[v]split=2[out1][out2]" \
|
|
|
-preset superfast -threads 2 -b 0.5M -minrate 0.5M -maxrate 0.5M -bufsize 1M \
|
|
|
- -map '[out1]' -vcodec libx264 "$outputFolder/$outputName.mp4" -map '[out2]' -vcodec libx264 "$outputFolder/$outputName.flv"
|
|
|
+ -map '[out1]'-map 1:a -vcodec libx264 "$outputFolder/$outputName.mp4" -map '[out2]' -map 1:a -vcodec libx264 "$outputFolder/$outputName.flv"
|
|
|
|
|
|
# FFREPORT=file="$outputFolder/$outputName.$videoFileType.txt":level=48 \
|
|
|
# ffmpeg -hide_banner -i $picFile -c:v libvpx -i $videoFile -filter_complex "[1:v][0:v]scale2ref[image][video];[video][image]overlay[v];[v]scale='2*trunc(iw/2)':'2*trunc(ih/2)'" \
|
|
@@ -202,7 +202,7 @@ if [ ! -z $videoFile ] && [ ! -z $picFile ] && [ ! -z $outputName ] && [ ! -z $o
|
|
|
covertVideoTask
|
|
|
concatAllLogFile
|
|
|
if command_exists "mediainfo"; then
|
|
|
- mediainfo --fullscan "$outputFolder/$outputName.$videoFileType" --Output=JSON >"$outputFolder/$outputName.json"
|
|
|
+ mediainfo --fullscan "$outputFolder/$outputName.mp4" --Output=JSON >"$outputFolder/$outputName.json"
|
|
|
mediainfo --fullscan "$outputFolder/$outputName.flv" --Output=JSON >"$outputFolder/$outputName.flv.json"
|
|
|
fi
|
|
|
|