X-Git-Url: https://code.delx.au/transcoding/blobdiff_plain/b19913d3f4b2b9adf4e9ae2546d7de5ed3c6cfc8..19b49083e7946fe60a37912ed449a41da7c1ba70:/fix-pal-speedup

diff --git a/fix-pal-speedup b/fix-pal-speedup
index b8cee2c..17e5e01 100755
--- a/fix-pal-speedup
+++ b/fix-pal-speedup
@@ -19,8 +19,24 @@ function mux_replace_audio {
     local audiofile="$2"
     local outfile="$3"
 
-    local trackid="$(mkvmerge -i "$infile" | grep 'Track ID.*video' | sed 's/^Track ID \(.\):.*$/\1/')"
-    mkvmerge -o "${outfile}" --default-duration "${trackid}:${FORCEFPS}fps" --no-audio "$infile" "$audiofile"
+    local audiodelay="$(get_audio_delay "$infile")"
+    local videotrackid="$(get_video_trackid "$infile")"
+
+    mkvmerge \
+        -o "${outfile}" \
+        --default-duration "${videotrackid}:${FORCEFPS}fps" \
+        --no-audio "$infile" \
+        --sync "0:$((audiodelay / 1000000))" \
+        "$audiofile"
+}
+
+function get_video_trackid {
+    mkvmerge -i "$1" | sed -n 's/Track ID \([0-9]*\): .*video.*/\1/p'
+}
+
+function get_audio_delay {
+    mkvmerge -F json -i "$1" | \
+        jq -r '.tracks[] | select(.type == "audio") | .properties.minimum_timestamp'
 }
 
 function encode_audio {
@@ -37,8 +53,8 @@ function convert_file {
     local outfile="$2"
     local audiofile="${tmpdir}/audiofile.m4a"
 
-    encode_audio "${infile}" "${audiofile}"
-    mux_replace_audio "${infile}" "${audiofile}" "${outfile}"
+    encode_audio "$infile" "$audiofile"
+    mux_replace_audio "$infile" "$audiofile" "$outfile"
 }