From e6c416ca0dcbbb22ee96e8175e1e394a8649fca2 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Wed, 3 Aug 2005 12:32:13 +0000
Subject: [PATCH] examples/pipeline-tester: Commit some updates I had.

Original commit message from CVS:
2005-08-03  Andy Wingo  <wingo@pobox.com>

* examples/pipeline-tester: Commit some updates I had.

* configure.ac (PYGST_CFLAGS): pygst.py generation is handled by
the makefile.
---
 ChangeLog                |  7 +++++++
 configure.ac             |  1 -
 examples/pipeline-tester | 35 ++++++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1dca134e90..94e3ba5276 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-03  Andy Wingo  <wingo@pobox.com>
+
+	* examples/pipeline-tester: Commit some updates I had.
+
+	* configure.ac (PYGST_CFLAGS): pygst.py generation is handled by
+	the makefile.
+
 2005-08-01  Edward Hervey  <edward@fluendo.com>
 
 	* README-docs:
diff --git a/configure.ac b/configure.ac
index 022c9e302a..1d5f894252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,6 @@ changequote([,])dnl
 
 AC_OUTPUT([
   Makefile
-  pygst.py
   examples/Makefile
   gst/Makefile
   pkgconfig/Makefile
diff --git a/examples/pipeline-tester b/examples/pipeline-tester
index 7da420aa19..1ee3210277 100755
--- a/examples/pipeline-tester
+++ b/examples/pipeline-tester
@@ -57,12 +57,41 @@ data = (('Video capture via V4L',
          '    tee. ! oggdemux name=demux \n'
          '    demux. ! queue ! theoradec ! xvimagesink \n'
          '    demux. ! queue ! vorbisdec ! audioconvert ! alsasink \n'
-         '    tee. ! filesink location=cooldance.ogg'),
+         '    tee. ! queue ! filesink location=cooldance.ogg'),
+        ('Video test, YUV format',
+         'videotestsrc \n'
+         '    ! video/x-raw-yuv,format=(fourcc)I420 \n'
+         '    ! xvimagesink'),
+        ('Video test, RGB format',
+         'videotestsrc \n'
+         '    ! video/x-raw-rgb,red_mask=0xff00 \n'
+         '    ! ximagesink'),
         ('Reencode Vorbis to mulaw, play via ALSA',
          'filesrc location=cooldance.ogg \n'
          '    ! oggdemux \n'
          '    ! vorbisdec ! audioconvert \n'
-         '    ! mulawenc ! mulawdec ! alsasink'))
+         '    ! mulawenc ! mulawdec ! alsasink'),
+        ('Capture DV via firewire, transcode into Ogg',
+         'dv1394src \n'
+         '    ! dvdec name=dec drop-factor=2 \n'
+         '    ! video/x-raw-yuv,format=(fourcc)YUY2 \n'
+         '    ! queue \n'
+         '    ! videorate \n'
+         '    ! videoscale \n'
+         '    ! video/x-raw-yuv,width=360,height=288 \n'
+         '    ! videoscale \n'
+         '    ! video/x-raw-yuv,width=240,height=192,framerate=10.0,format=(fourcc)YUY2 \n'
+         '    ! ffmpegcolorspace \n'
+         '    ! theoraenc \n'
+         '    ! oggmux name=mux \n'
+         '    ! filesink location=dv.ogg \n'
+         ' \n'
+         '    dec. \n'
+         '    ! audio/x-raw-int \n'
+         '    ! queue \n'
+         '    ! audioconvert \n'
+         '    ! vorbisenc \n'
+         '    ! mux.'))
 
 
 def escape(s, chars, escaper='\\'):
@@ -186,7 +215,7 @@ class Window(gtk.Window):
             self.set_sensitive(True)
         except gobject.GError, e:
             self.set_sensitive(True)
-            self.error('Could not create pipeline', e.__str__)
+            self.error('Could not create pipeline', str(e))
             return False
         watch_id = pipeline.get_bus().add_watch(self.on_message)
         if pipeline.set_state(gst.STATE_PLAYING) != gst.STATE_SUCCESS: