summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-11-03 12:31:30 +0100
committerHolger Levsen <holger@layer-acht.org>2014-11-03 12:31:30 +0100
commit1d161e71069ae494a1eaeed9606ec2bc4b154ca8 (patch)
tree9a853d0ef78e259a4a7a918aa288d62b537f8d9f /bin
parent5bcbe537979d3acd927957d035ebb333bb775339 (diff)
downloadjenkins.debian.net-1d161e71069ae494a1eaeed9606ec2bc4b154ca8.tar.xz
g-i-i: use avconv to create .webm videos instead
Diffstat (limited to 'bin')
-rw-r--r--bin/g-i-installation.sh6
-rwxr-xr-xbin/maintainance.sh1
2 files changed, 4 insertions, 3 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index e4a9002a..454451b1 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -69,9 +69,10 @@ fi
#
# video
#
-VIDEOBITRATE=1200
VIDEOSIZE=1024x768
VIDEOBGCOLOR=gray10
+FRAMERATE=24 # this is the input framerate
+CONVERTOPTS="-gravity center -background $VIDEOBGCOLOR -extent $VIDEOSIZE"
fetch_if_newer() {
url="$2"
@@ -123,7 +124,7 @@ cleanup_all() {
#
echo "$(date) - Creating video now. This may take a while.'"
TMPFILE=$(mktemp)
- ffmpeg2theora --videobitrate $VIDEOBITRATE --no-upscaling snapshot_%06d.png --framerate 12 --max_size $VIDEOSIZE -o g-i-installation-$NAME.ogv > $TMPFILE 2>&1 || cat $TMPFILE
+ avconv -r $FRAMERATE snapshot_%06d.png g-i-installation-$NAME.webm > $TMPFILE 2>&1 || cat $TMPFILE
rm snapshot_??????.png $TMPFILE
# rename .bak files back to .png
if find . -name "*.png.bak" > /dev/null ; then
@@ -164,7 +165,6 @@ bootstrap_system() {
echo "Doing g-i installation test for $NAME now."
# qemu related variables (incl kernel+initrd) - display first, as we grep for this in the process list
QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown -enable-kvm -cpu host"
- CONVERTOPTS="-gravity center -background $VIDEOBGCOLOR -extent $VIDEOSIZE"
if [ -n "$IMAGE" ] ; then
QEMU_OPTS="$QEMU_OPTS -cdrom $IMAGE -boot d"
case $NAME in
diff --git a/bin/maintainance.sh b/bin/maintainance.sh
index c9ed9db5..694c964a 100755
--- a/bin/maintainance.sh
+++ b/bin/maintainance.sh
@@ -157,6 +157,7 @@ else
report_disk_usage $1
report_filetype_usage $1 png
report_filetype_usage $1 ppm warn # FIXME: remove this check in 3 days (and add warn to pngs)
+ report_filetype_usage $1 ogv warn # FIXME: remove this check in 7 days
report_filetype_usage $1 bak warn
report_filetype_usage $1 raw warn
report_filetype_usage $1 iso warn