[Debconf-video-commits] r710 - in package/trunk: conf/dc11 debian src

[Ben Hutchings]

Author: benh
Date: 2011-07-25 23:06:39 +0000 (Mon, 25 Jul 2011)
New Revision: 710

Modified:
   package/trunk/conf/dc11/default-scratchy
   package/trunk/conf/dc11/default-selma
   package/trunk/debian/changelog
   package/trunk/src/dc-start-sink
Log:
* Allow more stream encoding options to be added
* Set stream to half frame rate (12.5 Hz) and slower (higher quality) encoding


Modified: package/trunk/conf/dc11/default-scratchy
===================================================================
--- package/trunk/conf/dc11/default-scratchy	2011-07-25 23:02:31 UTC (rev 709)
+++ package/trunk/conf/dc11/default-scratchy	2011-07-25 23:06:39 UTC (rev 710)
@@ -14,6 +14,7 @@
 VIDEO_STREAM_WIDTH=320
 VIDEO_STREAM_HEIGHT=240
 VIDEO_STREAM_KBPS=230
+VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
 AUDIO_STREAM_HZ=48000
 AUDIO_STREAM_KBPS=64
 # File store base directory

Modified: package/trunk/conf/dc11/default-selma
===================================================================
--- package/trunk/conf/dc11/default-selma	2011-07-25 23:02:31 UTC (rev 709)
+++ package/trunk/conf/dc11/default-selma	2011-07-25 23:06:39 UTC (rev 710)
@@ -13,6 +13,7 @@
 VIDEO_STREAM_WIDTH=320
 VIDEO_STREAM_HEIGHT=240
 VIDEO_STREAM_KBPS=230
+VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
 AUDIO_STREAM_HZ=48000
 AUDIO_STREAM_KBPS=64
 # File store base directory

Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2011-07-25 23:02:31 UTC (rev 709)
+++ package/trunk/debian/changelog	2011-07-25 23:06:39 UTC (rev 710)
@@ -2,6 +2,9 @@
 
   * Allow stream path to be independent from room name used in file names
   * Fix name of 'Round room' but keep the same stream path
+  * Allow more stream encoding options to be added
+  * Set stream to half frame rate (12.5 Hz) and slower (higher quality)
+    encoding
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 26 Jul 2011 00:57:53 +0200
 

Modified: package/trunk/src/dc-start-sink
===================================================================
--- package/trunk/src/dc-start-sink	2011-07-25 23:02:31 UTC (rev 709)
+++ package/trunk/src/dc-start-sink	2011-07-25 23:06:39 UTC (rev 710)
@@ -6,12 +6,16 @@
 VIDEO_STREAM_WIDTH=320
 VIDEO_STREAM_HEIGHT=240
 VIDEO_STREAM_KBPS=230
+VIDEO_STREAM_OPTS=
 AUDIO_STREAM_HZ=48000
 AUDIO_STREAM_KBPS=64
 ICECAST_PATH=
 source /etc/default/debconf-video
 
 # Optional variables
+if [ -z "$VIDEO_STREAM_OPTS" ]; then
+    VIDEO_STREAM_OPTS="-V $VIDEO_STREAM_KBPS --cropleft 8 --cropright 8 -x $VIDEO_STREAM_WIDTH -y $VIDEO_STREAM_HEIGHT --speedlevel 2"
+fi
 if [ -z "$ICECAST_PATH" ]; then
     ICECAST_PATH="/${ROOM_NAME// /_}.ogv"
 fi
@@ -42,11 +46,8 @@
 	icecast)
 	    ssh $sink_host dvsink-command -h $MIXER_HOST -p $MIXER_PORT \
 	        --                                                      \
-	        ffmpeg2theora -o - -f dv - -V $VIDEO_STREAM_KBPS        \
-		--cropleft 8 --cropright 8                              \
-	        -x $VIDEO_STREAM_WIDTH -y $VIDEO_STREAM_HEIGHT          \
-	        -A $AUDIO_STREAM_KBPS -H $AUDIO_STREAM_HZ               \
-		--speedlevel 2                                          \
+	        ffmpeg2theora -o - -f dv - $VIDEO_STREAM_OPTS		\
+ 	        -A $AUDIO_STREAM_KBPS -H $AUDIO_STREAM_HZ               \
 	        --artist "'DebConf video team'"                         \
 	        --date "'$(date +%Y-%m-%d)'"                            \
 	        --location "'$VENUE_NAME'"                              \