commit 0cde0843649210d99c273ca42e2685e558d187e8
Author: Máirín Duffy <mairin linuxgrrl com>
Date: Fri Apr 5 19:48:23 2013 -0400
update to work with newer gstreamer
Fixes with a bunch of help from Tim-Philipp Müller
eb1304-to-ogg.sh | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/eb1304-to-ogg.sh b/eb1304-to-ogg.sh
old mode 100755
new mode 100644
index bb22b15..0689677
--- a/eb1304-to-ogg.sh
+++ b/eb1304-to-ogg.sh
@@ -6,7 +6,8 @@
#
# Copyright (C) 2009 Ray Strode
#
-# Based on guessing and example pipelines found around the internets.
+# Based on guessing and example pipelines found around the internets and
+# a huge amount of help from Tim-Philipp Müller.
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
@@ -90,41 +91,35 @@ else
exit 1
fi
-gst-launch $LAUNCH_ARGS \
+gst-launch -v $LAUNCH_ARGS \
filesrc name=upper_left_video_and_audio \
location=$INPUT_VIDEO_1_AND_AUDIO \
- ! avidemux name=avi_extractor \
- ! multiqueue name=streams \
- \
- avi_extractor.video_00 ! streams.sink0 \
- avi_extractor.audio_00 ! streams.sink1 \
+ ! decodebin2 name=streams \
\
oggmux name=ogg_packer \
! filesink location="$OUTPUT_FILE" \
\
streams.src1 \
- ! decodebin \
! audioconvert \
! audioamplify amplification=$AUDIO_BOOST_FACTOR \
! audioresample \
- ! audiorate \
+ ! audiorate \
+ ! queue max-size-time=5000000000 max-size-bytes=0 max-size-buffers=0 \
! vorbisenc \
! ogg_packer. \
\
streams.src0 \
- ! decodebin \
! videoscale \
! 'video/x-raw-yuv,width=720,height=480' \
! videobox right=-720 bottom=-480 \
! ffmpegcolorspace \
- ! queue \
+ ! queue max-size-time=5000000000 max-size-bytes=0 max-size-buffers=0
\
! quad_screen.sink_0 \
\
\
filesrc name=upper_right_video \
location=$INPUT_VIDEO_2 \
- ! queue \
- ! decodebin \
+ ! decodebin2 \
! videoscale \
! 'video/x-raw-yuv,width=720,height=480' \
! ffmpegcolorspace \
@@ -133,8 +128,7 @@ gst-launch $LAUNCH_ARGS \
\
filesrc name=lower_left_video \
location=$INPUT_VIDEO_3 \
- ! queue \
- ! decodebin \
+ ! decodebin2 \
! videoscale \
! 'video/x-raw-yuv,width=720,height=480' \
! ffmpegcolorspace \
@@ -143,8 +137,7 @@ gst-launch $LAUNCH_ARGS \
\
filesrc name=lower_right_video \
location=$INPUT_VIDEO_4 \
- ! queue \
- ! decodebin \
+ ! decodebin2 \
! videoscale \
! 'video/x-raw-yuv,width=720,height=480' \
! ffmpegcolorspace \
@@ -158,6 +151,7 @@ gst-launch $LAUNCH_ARGS \
sink_3::xpos=720 sink_3::ypos=480 sink_3::zorder=1 \
! ffmpegcolorspace \
! videorate \
+ ! queue \
! theoraenc \
! progressreport name="Encoding Progress" \
! ogg_packer. \
@@ -165,3 +159,4 @@ gst-launch $LAUNCH_ARGS \
\
\
+