From caeb426aefe045a7115d5aa882d8c0caf336d5ec Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 9 Sep 2012 09:49:14 +0200
Subject: [PATCH] scripts/encode_{mp4,webm}.sh: simplify for reuse

---
 scripts/encode_mp4.sh  | 35 ++++++++++++++++----------------
 scripts/encode_webm.sh | 45 +++++++++++++++++++++---------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/scripts/encode_mp4.sh b/scripts/encode_mp4.sh
index cbbb10472..81583ed32 100755
--- a/scripts/encode_mp4.sh
+++ b/scripts/encode_mp4.sh
@@ -1,33 +1,34 @@
-#!/bin/sh
+#!/bin/sh -e
 
 if=$1
 of=`basename "$1"`".mp4"
 
-schedtool -De \
-    ffmpeg -i "$if" \
+# No. CPU cores:
+threads=2
+# Video bitrate:
+vb=400k
+# Audio bitrate:
+ab=96k
+
+ffmpeg -i "$if" \
     -f mp4 \
     -an \
-    -threads 4 \
-    -deinterlace \
+    -threads $threads \
     -vcodec libx264 \
     -vpre libx264-ipod640 \
-    -b:v 400k \
+    -b:v $vb \
     -pass 1 \
     -passlogfile "$of.ffmpeg2pass" \
-    -y \
-    /dev/null && \
-schedtool -De \
-    ffmpeg -i "$if" \
+    -y /dev/null
+ffmpeg -i "$if" \
     -f mp4 \
-    -acodec libmp3lame \
-    -ab 96k \
-    -threads 4 \
-    -deinterlace \
+    -acodec libfaac \
+    -ab $ab \
+    -threads $threads \
     -vcodec libx264 \
     -vpre libx264-ipod640 \
-    -b:v 400k \
+    -b:v $vb \
     -pass 2 \
     -passlogfile "$of.ffmpeg2pass" \
-    -y \
-    "$of"
+    -y "$of"
 
diff --git a/scripts/encode_webm.sh b/scripts/encode_webm.sh
index d3654b2b8..a4e52de0c 100755
--- a/scripts/encode_webm.sh
+++ b/scripts/encode_webm.sh
@@ -1,34 +1,33 @@
-#!/bin/sh
+#!/bin/sh -e
 
 
 if=$1
 of=`basename "$1"`".webm"
 
-if [ ! -f "$of.ffmpeg2pass-0.log" ]; then
-	schedtool -De \
-	    ffmpeg -i "$if" \
-	    -threads 4 \
-	    -f webm \
-	    -an \
-	    -vcodec libvpx \
-	    -deinterlace \
-	    -b:v 400k \
-	    -pass 1 \
-	    -passlogfile "$of.ffmpeg2pass" \
-	    -y \
-	    /dev/null || exit 1
-fi
-schedtool -De \
-    ffmpeg -i "$if" \
-    -threads 4 \
+# No. CPU cores:
+threads=2
+# Video bitrate:
+vb=400k
+# Audio bitrate:
+ab=96k
+
+ffmpeg -i "$if" \
+    -threads $threads \
+    -f webm \
+    -an \
+    -vcodec libvpx \
+    -b:v $vb \
+    -pass 1 \
+    -passlogfile "$of.ffmpeg2pass" \
+    -y /dev/null
+ffmpeg -i "$if" \
+    -threads $threads \
     -f webm \
     -acodec libvorbis \
-    -ab 96k \
+    -ab $ab \
     -vcodec libvpx \
-    -deinterlace \
-    -b:v 400k \
+    -b:v $vb \
     -pass 2 \
     -passlogfile "$of.ffmpeg2pass" \
-    -y \
-    "$of" || exit 1
+    -y "$of"