From a255c296bf31cc7d8d8e778f6c2224d8d31ea8c1 Mon Sep 17 00:00:00 2001
From: q3aql <q3aql@protonmail.ch>
Date: Tue, 18 Jan 2022 20:53:03 +0100
Subject: [PATCH] Update vsync & async syntax

---
 src/ks-avi  | 3 ++-
 src/ks-crop | 3 ++-
 src/ks-mix  | 2 +-
 src/ks-mp4  | 3 ++-
 src/ks-mp4k | 3 ++-
 src/ks-mp4s | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/ks-avi b/src/ks-avi
index 1520754..78854c4 100755
--- a/src/ks-avi
+++ b/src/ks-avi
@@ -197,7 +197,8 @@ fi
 # Conversion parameters
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
-f_conversion="-vsync 1 -async 1"
+# f_conversion="-vsync 1 -async 1" # Deprecated method
+f_conversion="-vsync cfr -af aresample=async=1:min_hard_comp=0.100000:first_pts=0"
 # Check if video input uses H265 (HEVC)
 codec_h265=$(${p_ffmpeg} "${1}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "h265")
 codec_hevc=$(${p_ffmpeg} "${1}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "hevc")
diff --git a/src/ks-crop b/src/ks-crop
index d40629d..9873d14 100755
--- a/src/ks-crop
+++ b/src/ks-crop
@@ -136,7 +136,8 @@ function errorReadingFile() {
 # Conversion parameters
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
-f_conversion="-vsync 1 -async 1"
+# f_conversion="-vsync 1 -async 1" # Deprecated method
+f_conversion="-vsync cfr -af aresample=async=1:min_hard_comp=0.100000:first_pts=0"
 # Check if video input uses H265 (HEVC)
 codec_h265=$(${p_ffmpeg} "${2}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "h265")
 codec_hevc=$(${p_ffmpeg} "${2}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "hevc")
diff --git a/src/ks-mix b/src/ks-mix
index 3d7b1de..02c4843 100755
--- a/src/ks-mix
+++ b/src/ks-mix
@@ -208,7 +208,7 @@ elif [ "${1}" == "-ev25" ] ; then
     if [ "${codec_encoded}" == "h264_encoded" ] ; then
       ffmpeg -y -i "${2}" -map ${video_track} -c copy -f h264 "${current_dir}/seeing_noaudio.h264"
       ffmpeg -y -r 25 -i "${current_dir}/seeing_noaudio.h264" -c copy "${current_dir}/seeing.mp4"
-      ffmpeg -y -i "${current_dir}/seeing.mp4" -map 0:0 -vsync 1 -c:v copy "${video_file_dir}"
+      ffmpeg -y -i "${current_dir}/seeing.mp4" -map 0:0 -vsync cfr -c:v copy "${video_file_dir}"
       echo ""
       echo -n "* Extracted video into ${video_file_dir} (25 fps)"
       sleep 2
diff --git a/src/ks-mp4 b/src/ks-mp4
index 77283cc..3193122 100755
--- a/src/ks-mp4
+++ b/src/ks-mp4
@@ -197,7 +197,8 @@ fi
 # Conversion parameters
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
-f_conversion="-vsync 1 -async 1"
+# f_conversion="-vsync 1 -async 1" # Deprecated method
+f_conversion="-vsync cfr -af aresample=async=1:min_hard_comp=0.100000:first_pts=0"
 # Check if video input uses H265 (HEVC)
 codec_h265=$(${p_ffmpeg} "${1}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "h265")
 codec_hevc=$(${p_ffmpeg} "${1}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "hevc")
diff --git a/src/ks-mp4k b/src/ks-mp4k
index 30e76b6..a5c098f 100755
--- a/src/ks-mp4k
+++ b/src/ks-mp4k
@@ -197,7 +197,8 @@ fi
 # Conversion parameters
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
-f_conversion="-vsync 1 -async 1"
+# f_conversion="-vsync 1 -async 1" # Deprecated method
+f_conversion="-vsync cfr -af aresample=async=1:min_hard_comp=0.100000:first_pts=0"
 # Check if video input uses H265 (HEVC)
 codec_h265=$(${p_ffmpeg} "${1}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "h265")
 codec_hevc=$(${p_ffmpeg} "${1}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "hevc")
diff --git a/src/ks-mp4s b/src/ks-mp4s
index d92e75b..206af9d 100755
--- a/src/ks-mp4s
+++ b/src/ks-mp4s
@@ -197,7 +197,8 @@ fi
 # Conversion parameters
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
-f_conversion="-vsync 1 -async 1"
+# f_conversion="-vsync 1 -async 1" # Deprecated method
+f_conversion="-vsync cfr -af aresample=async=1:min_hard_comp=0.100000:first_pts=0"
 # Check if video input uses H265 (HEVC)
 codec_h265=$(${p_ffmpeg} "${1}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "h265")
 codec_hevc=$(${p_ffmpeg} "${1}" 2>&1 | grep Stream | tr -s " " | grep "Video:" | grep "hevc")