X-Git-Url: https://code.delx.au/transcoding/blobdiff_plain/50c7b99e41ff11dc345680cbda32a1b043f2a3fa..59178cc821413a5092fc2eba784f83f8b4b59414:/fix-pal-speedup

diff --git a/fix-pal-speedup b/fix-pal-speedup
index ab49490..5b77d45 100755
--- a/fix-pal-speedup
+++ b/fix-pal-speedup
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 
 # Many DVDs released in Australia are sped up from 24fps to 25fps.
 # This script reverses the procedure, correcting the audio pitch.
@@ -6,69 +6,61 @@
 # slowed, and encoded as AAC, preserving surround sound.
 
 if [ -z "$1" -o -z "$2" ]; then
-    echo "Usage: $0 destdir infile [infile ...]"
+    echo "Usage: $0 infile outfile"
     exit 1
 fi
 
-set -xe
+set -o pipefail -eux
 FORCEFPS="24"
-SLOWFILTER="-filter asetrate=46080,aresample=48000"
+SLOWFILTER="-filter asetrate=46080,aresample=osr=48000:resampler=soxr"
 
 function mux_replace_audio {
     local infile="$1"
     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_minimum_timestamp "$infile" "audio")"
+    local videodelay="$(get_minimum_timestamp "$infile" "video")"
+    local videotrackid="$(get_track_id "$infile" "video")"
+
+    mkvmerge \
+        -o "${outfile}" \
+        --default-duration "${videotrackid}:${FORCEFPS}fps" \
+        --sync "${videotrackid}:$((videodelay / 1000000))" \
+        --no-audio "$infile" \
+        --sync "0:$((audiodelay / 1000000))" \
+        "$audiofile"
 }
 
-function extract_audio {
-    local infile="$1"
-    local outfile="$2"
+function get_track_id {
+    mkvmerge -i -F json "$1" | jq -r ".tracks[] | select(.type == \"$2\") | .id"
+}
 
-    mplayer \
-        -noconfig all \
-        -novideo \
-        -channels 8 \
-        -dumpaudio \
-        -dumpfile "$outfile" \
-        "$infile"
+function get_minimum_timestamp {
+    mkvmerge -F json -i "$1" | jq -r ".tracks[] | select(.type == \"$2\") | .properties.minimum_timestamp"
 }
 
 function encode_audio {
     ffmpeg \
         -i "$1" \
+        -vn \
         $SLOWFILTER \
-        -strict experimental \
+        -c:a libfdk_aac -vbr 3 \
         "$2"
 }
 
 function convert_file {
     local infile="$1"
     local outfile="$2"
-    local audio1="${tmpdir}/audio1.ac3"
-    local audio2="${tmpdir}/audio2.m4a"
+    local audiofile="${tmpdir}/audiofile.m4a"
 
-    extract_audio "${infile}" "${audio1}"
-    encode_audio "${audio1}" "${audio2}"
-    mux_replace_audio "${infile}" "${audio2}" "${outfile}"
+    encode_audio "$infile" "$audiofile"
+    mux_replace_audio "$infile" "$audiofile" "$outfile"
 }
 
 
-destdir="$1"
-shift
-
-for infile in "$@"; do
-    outfile="$destdir/$(basename "$infile")"
-
-    if [ -f "$outfile" ]; then
-        echo "Not overwriting $outfile"
-        continue
-    fi
-
-    tmpdir="$(mktemp -d "${TMPDIR:-/var/tmp}/pal-XXXXXXXX")"
-    convert_file "$infile" "$outfile"
-    rm -rf "$tmpdir"
-done
-
+infile="$1"
+outfile="$2"
+tmpdir="$(mktemp -d "${TMPDIR:-/var/tmp}/pal-XXXXXXXX")"
+convert_file "$infile" "$outfile"
+rm -rf "$tmpdir"