From caeb426aefe045a7115d5aa882d8c0caf336d5ec Mon Sep 17 00:00:00 2001
From: Astro
Date: Sun, 9 Sep 2012 09:49:14 +0200
Subject: [PATCH 1/2] 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"
From 139ca9ac56a5bfd9ced5107a70a12aa49daf6444 Mon Sep 17 00:00:00 2001
From: Astro
Date: Sun, 9 Sep 2012 09:49:38 +0200
Subject: [PATCH 2/2] news/ta-haskell-yesod: Videomitschnitt
---
content/news/ta-haskell-yesod.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/content/news/ta-haskell-yesod.xml b/content/news/ta-haskell-yesod.xml
index d138092bf..d86aadb66 100644
--- a/content/news/ta-haskell-yesod.xml
+++ b/content/news/ta-haskell-yesod.xml
@@ -14,6 +14,7 @@
Konzepten. Damit ihr bei solch Code nicht nur Bahnhof versteht,
wollen wir euch Haskell an einem Themenabend vorstellen.
+
Wenn ihr Code-Beispiele live nachvollziehen möchtet, installiert
zur Vorbereitung den Glasgow Haskell Compiler und das Tool für
@@ -24,8 +25,14 @@
Für das Webframework Yesod danach:
cabal update && cabal install -p yesod-platform
-
+
+
+
+
+
+ Wir danken wieder einmal COeins für das Anfertigen und Bearbeiten der Videomitschnitte.