[flumotion-commit] wtay - in flumotion/trunk: . conf flumotion/manager

[commits at core.fluendo.com]

Author: wtay
Date: Mon Oct 18 22:18:40 2004
New Revision: 906

Added:
   flumotion/trunk/conf/dv-ogg-theora-vorbis.xml
Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/manager/main.py
Log:
        * conf/dv-ogg-theora-vorbis.xml:
	* flumotion/manager/main.py:
	Added ogg theora vorbis example
	Fix correct var for the filename.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Oct 18 22:18:40 2004
@@ -1,3 +1,10 @@
+2004-10-18  Wim Taymans  <wim at fluendo.com>
+
+	* conf/dv-ogg-theora-vorbis.xml:
+	* flumotion/manager/main.py:
+	Added ogg theora vorbis example
+	Fix correct var for the filename.
+
 2004-10-18  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* conf/Makefile.am:

Added: flumotion/trunk/conf/dv-ogg-theora-vorbis.xml
==============================================================================
--- (empty file)
+++ flumotion/trunk/conf/dv-ogg-theora-vorbis.xml	Mon Oct 18 22:18:40 2004
@@ -0,0 +1,69 @@
+<planet>
+  <!-- the manager and the bouncer with user/password test/test 
+       This bouncer is user to authenticate other components in the
+       system, but not client connecting to the stream. -->
+  <manager>
+    <component name="manager-bouncer" type="htpasswdcrypt">
+<data><![CDATA[
+test:PSfNpHTkpTx1M
+]]></data>
+    </component>
+  </manager>
+
+  <flow name="dv-example">
+    <!-- a component that reads from a firewire port, decodes the dv audio/video, resizes
+         and resamples and corrects for dropouts -->
+    <component name="dv-camera" type="producer">
+      <feed>video</feed>
+      <feed>audio</feed>
+      <pipeline>
+         dv1394src ! dvdec name=dec drop-factor=2 ! video/x-raw-yuv,format=(fourcc)YUY2 ! 
+           videorate ! videoscale ! video/x-raw-yuv,width=384,height=288 ! 
+           videoscale ! video/x-raw-yuv,width=384,height=268,framerate=12.5,format=(fourcc)YUY2 ! @feeder::video@
+         dec. ! audio/x-raw-int ! audiorate ! 
+           audioscale ! audio/x-raw-int,rate=24000 ! @feeder::audio@
+      </pipeline>
+    </component>
+    
+    <!-- add an overlay to the raw video stream, make sure to have a png image in
+         the directory where you start the server. -->
+    <component name="dv-with-overlay" type="converter">
+      <source>dv-camera:video</source>
+      <pipeline>
+         filesrc location=dv_384x268.png blocksize=100000 ! pngdec ! 
+           alphacolor ! videomixer name=mix ! @feeder::video@
+         @eater:dv-camera:video@ ! video/x-raw-yuv,width=384,height=268,framerate=12.5 ! ffmpegcolorspace ! alpha ! mix. 
+      </pipeline>
+      <feed>video</feed>
+    </component>
+  
+    <component name="dv-theora" type="converter">
+      <source>dv-with-overlay</source>
+      <pipeline>ffmpegcolorspace ! theoraenc bitrate=300</pipeline>
+      <feed>video</feed>
+    </component>
+
+    <component name="dv-vorbis" type="converter">
+      <source>dv-camera:audio</source>
+      <pipeline>audioconvert ! rawvorbisenc bitrate=32000</pipeline>
+      <feed>audio</feed>
+    </component>
+
+    <component name="dv-ogg-theora-vorbis" type="converter">
+      <source>dv-theora:video</source>
+      <source>dv-vorbis:audio</source>
+      <feed>ogg</feed>
+      <pipeline>
+          { @eater:dv-vorbis:audio@ } { @eater:dv-theora:video@ } 
+          eater:dv-vorbis:audio. ! queue max-size-buffers=16 ! oggmux name=mux 
+          eater:dv-theora:video. ! queue max-size-buffers=16 ! mux. mux. ! @feeder::ogg@
+      </pipeline>
+    </component>
+
+    <component name="streamer-ogg-theora" type="http-streamer">
+      <source>dv-ogg-theora-vorbis:ogg</source>
+      <port>8800</port>
+      <logfile>/tmp/ogg-test-theora.access.log</logfile>
+    </component>
+  </flow>
+</planet>

Modified: flumotion/trunk/flumotion/manager/main.py
==============================================================================
--- flumotion/trunk/flumotion/manager/main.py	(original)
+++ flumotion/trunk/flumotion/manager/main.py	Mon Oct 18 22:18:40 2004
@@ -90,7 +90,7 @@
         try:
             _loadConfig(vishnu, path)
         except config.ConfigError, reason:
-            sys.stderr.write("ERROR: failed to load planet configuration '%s':\n" % filename)
+            sys.stderr.write("ERROR: failed to load planet configuration '%s':\n" % path)
             sys.stderr.write("%s\n" % reason)
             # bypass reactor, because sys.exit gets trapped
             os._exit(-1)