4dage/4dage-ffmpeg-img2video 0.0.5

4dage/4dage-ffmpeg-img2video

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version="0.0.4"
+version="0.0.5"
 picsFolder=''
 audioFile=''
 outputName=''
@@ -178,12 +178,12 @@ covertVideoTask() {
 
     # -i $audioFile -filter_complex "[0:v]scale=1920:-1[vid];[vid]split=2[out1][out2]" \
     FFREPORT=file="$outputFolder/$outputName.txt":level=48 ffmpeg -hide_banner -y -i $allImages \
-        -preset superfast -threads 2 -framerate 1 -q:v 2 -pix_fmt yuv420p -c:a copy -r $frameRate "$outputFolder/$outputName.origin.mp4"
+        -preset superfast -threads 2 -framerate 1 -q:v 2 -pix_fmt yuv420p -r $frameRate "$outputFolder/$outputName.origin.mp4"
     FFREPORT=file="$outputFolder/$outputName.txt":level=48 ffmpeg -hide_banner -y -i "$outputFolder/$outputName.origin.mp4" \
         -i $audioFile -filter_complex "[0:v]scale=1920:-1[vid];[vid]split=2[out1][out2]" \
         -threads 2 -b 1.8M -minrate 1.8M -maxrate 1.8M -bufsize 2M \
-        -map '[out1]' -profile:v high -vcodec libx264 -ab 128k "$outputFolder/$outputName.mp4" \
-        -map '[out2]' -profile:v high -vcodec libx264 -ab 128k "$outputFolder/$outputName.flv"
+        -map '[out1]' -map 1:a? -strict -2 -shortest -profile:v high -vcodec libx264 -c:a copy -ab 128k "$outputFolder/$outputName.mp4" \
+        -map '[out2]' -map 1:a? -strict -2 -shortest -profile:v high -vcodec libx264 -c:a copy -ab 128k "$outputFolder/$outputName.flv"
 
     if test $allowOrigin -eq 0; then
         rm "$outputFolder/$outputName.origin.mp4"

install-ffmpeg

@@ -659,44 +659,44 @@ CONFIGURE_OPTIONS+=("--enable-libsrt")
 ## HWaccel library
 ##
 
-# if [[ "$OSTYPE" == "linux-gnu" ]]; then
-#   if command_exists "nvcc"; then
-#     if build "nv-codec"; then
-#       download "https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.0.10.0/nv-codec-headers-11.0.10.0.tar.gz"
-#       execute make PREFIX="${WORKSPACE}"
-#       execute make install PREFIX="${WORKSPACE}"
-#       build_done "nv-codec"
-#     fi
-#     CFLAGS+=" -I/usr/local/cuda/include"
-#     LDFLAGS+=" -L/usr/local/cuda/lib64"
-#     CONFIGURE_OPTIONS+=("--enable-cuda-nvcc" "--enable-cuvid" "--enable-nvenc" "--enable-cuda-llvm")
-
-#     if [ -z "$LDEXEFLAGS" ]; then
-#       CONFIGURE_OPTIONS+=("--enable-libnpp") # Only libnpp cannot be statically linked.
-#     fi
-
-#     # https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
-#     CONFIGURE_OPTIONS+=("--nvccflags=-gencode arch=compute_52,code=sm_52")
-#   fi
-
-#   # Vaapi doesn't work well with static links FFmpeg.
-#   if [ -z "$LDEXEFLAGS" ]; then
-#     # If the libva development SDK is installed, enable vaapi.
-#     if library_exists "libva"; then
-#       if build "vaapi"; then
-#         build_done "vaapi"
-#       fi
-#       CONFIGURE_OPTIONS+=("--enable-vaapi")
-#     fi
-#   fi
-# fi
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+  if command_exists "nvcc"; then
+    if build "nv-codec"; then
+      download "https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.0.10.0/nv-codec-headers-11.0.10.0.tar.gz"
+      execute make PREFIX="${WORKSPACE}"
+      execute make install PREFIX="${WORKSPACE}"
+      build_done "nv-codec"
+    fi
+    CFLAGS+=" -I/usr/local/cuda/include"
+    LDFLAGS+=" -L/usr/local/cuda/lib64"
+    CONFIGURE_OPTIONS+=("--enable-cuda-nvcc" "--enable-cuvid" "--enable-nvenc" "--enable-cuda-llvm")
 
-##
-## FFmpeg
-##
+    if [ -z "$LDEXEFLAGS" ]; then
+      CONFIGURE_OPTIONS+=("--enable-libnpp") # Only libnpp cannot be statically linked.
+    fi
+
+    # https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
+    CONFIGURE_OPTIONS+=("--nvccflags=-gencode arch=compute_52,code=sm_52")
+  fi
+
+  # Vaapi doesn't work well with static links FFmpeg.
+  if [ -z "$LDEXEFLAGS" ]; then
+    # If the libva development SDK is installed, enable vaapi.
+    if library_exists "libva"; then
+      if build "vaapi"; then
+        build_done "vaapi"
+      fi
+      CONFIGURE_OPTIONS+=("--enable-vaapi")
+    fi
+  fi
+fi
+
+#
+# FFmpeg
+#
 
 build "ffmpeg"
-download "https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/553eb0773763798a6b9656b621cb125e1f6edbcc.tar.gz"
+download "https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/09c358362008e2d04cec8239526c6827543da4cf.tar.gz"
 # shellcheck disable=SC2086
 ./configure "${CONFIGURE_OPTIONS[@]}" \
   --disable-debug \