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

diff --git a/fix-pal-speedup b/fix-pal-speedup
index edac664..5b77d45 100755
--- a/fix-pal-speedup
+++ b/fix-pal-speedup
@@ -1,39 +1,66 @@
-#!/bin/bash -e
+#!/bin/bash
 
-# Many DVDs released in Australia are sped up from 23.976fps to 25fps.
+# Many DVDs released in Australia are sped up from 24fps to 25fps.
 # This script reverses the procedure, correcting the audio pitch.
-# Input files are assumed to be mkv files with track 2 audio.
-# The video framerate is adjusted without re-encoding. The audio is slowed and
-# normalised then re-encoded as mp3.
+# The video framerate is adjusted without re-encoding. The audio is
+# slowed, and encoded as AAC, preserving surround sound.
 
 if [ -z "$1" -o -z "$2" ]; then
-	echo "Usage: $0 destdir infile"
-	exit 1
+    echo "Usage: $0 infile outfile"
+    exit 1
 fi
 
-# FORCEFPS = 24000 / 1001
-# SLOWDOWN = FORCEFPS / 25
-FORCEFPS="23.976023976023978"
-SLOWDOWN="0.9590409590409591"
+set -o pipefail -eux
+FORCEFPS="24"
+SLOWFILTER="-filter asetrate=46080,aresample=osr=48000:resampler=soxr"
 
-destdir="$1"
-infile="$2"
-outfile="$destdir/$(basename "$infile")"
-tmpdir="$(tempfile -p 'pal-')"
-rm "$tmpdir"
+function mux_replace_audio {
+    local infile="$1"
+    local audiofile="$2"
+    local outfile="$3"
 
-if [ -f "$outfile" ]; then
-	echo "Not overwriting $outfile"
-	exit 0
-fi
+    local audiodelay="$(get_minimum_timestamp "$infile" "audio")"
+    local videodelay="$(get_minimum_timestamp "$infile" "video")"
+    local videotrackid="$(get_track_id "$infile" "video")"
 
-set -x
-mkdir "$tmpdir"
-mkvextract tracks "$infile" 2:"${tmpdir}/audio"
-mplayer -ao pcm:file="${tmpdir}/audio.wav" -vo null "${tmpdir}/audio"
-sox "${tmpdir}/audio.wav" "${tmpdir}/audio-fixed.wav" speed "${SLOWDOWN}" gain -n
-lame --preset standard "${tmpdir}/audio-fixed.wav" "${tmpdir}/audio.mp3"
-mkvmerge -o "${outfile}" --default-duration "1:${FORCEFPS}fps" --no-audio "$infile" "${tmpdir}/audio.mp3"
+    mkvmerge \
+        -o "${outfile}" \
+        --default-duration "${videotrackid}:${FORCEFPS}fps" \
+        --sync "${videotrackid}:$((videodelay / 1000000))" \
+        --no-audio "$infile" \
+        --sync "0:$((audiodelay / 1000000))" \
+        "$audiofile"
+}
 
-rm -rf "$tmpdir"
+function get_track_id {
+    mkvmerge -i -F json "$1" | jq -r ".tracks[] | select(.type == \"$2\") | .id"
+}
+
+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 \
+        -c:a libfdk_aac -vbr 3 \
+        "$2"
+}
 
+function convert_file {
+    local infile="$1"
+    local outfile="$2"
+    local audiofile="${tmpdir}/audiofile.m4a"
+
+    encode_audio "$infile" "$audiofile"
+    mux_replace_audio "$infile" "$audiofile" "$outfile"
+}
+
+
+infile="$1"
+outfile="$2"
+tmpdir="$(mktemp -d "${TMPDIR:-/var/tmp}/pal-XXXXXXXX")"
+convert_file "$infile" "$outfile"
+rm -rf "$tmpdir"