From: James Bunton <jamesbunton@delx.net.au>
Date: Wed, 10 Feb 2016 10:49:35 +0000 (+1100)
Subject: fix-pal-speedup: use fdk aac encoder, no need for separate mplayer dump
X-Git-Url: https://code.delx.au/transcoding/commitdiff_plain/3f4e270f745bb047a89416d6f2d9a6b2977611c2

fix-pal-speedup: use fdk aac encoder, no need for separate mplayer dump
---

diff --git a/fix-pal-speedup b/fix-pal-speedup
index ab49490..05a4b9a 100755
--- a/fix-pal-speedup
+++ b/fix-pal-speedup
@@ -12,7 +12,7 @@ fi
 
 set -xe
 FORCEFPS="24"
-SLOWFILTER="-filter asetrate=46080,aresample=48000"
+SLOWFILTER="-filter asetrate=46080,aresample=osr=48000:resampler=soxr"
 
 function mux_replace_audio {
     local infile="$1"
@@ -23,36 +23,22 @@ function mux_replace_audio {
     mkvmerge -o "${outfile}" --default-duration "${trackid}:${FORCEFPS}fps" --no-audio "$infile" "$audiofile"
 }
 
-function extract_audio {
-    local infile="$1"
-    local outfile="$2"
-
-    mplayer \
-        -noconfig all \
-        -novideo \
-        -channels 8 \
-        -dumpaudio \
-        -dumpfile "$outfile" \
-        "$infile"
-}
-
 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}"
 }