[Elisa-commits] Changeset 4785 by alessandro

[Linda]

Hola,

I'm Linda, the friendly SVN commit spy.

On Tue, 29 Jan 2008 15:56:12 -0000, alessandro has committed some new stuff. The
log message was:

"""
        * elisa/plugins/good/gstreamer_plugin/gst_metadata.py:
        Put videoscale after RawImageVarianceFilter.
        Set proper caps on pad templates.

"""

Maintainers of changed files are:

 - trunk/elisa/plugins/good/gstreamer_plugin/gst_metadata.py
  * Alessandro Decina <alessandro at fluendo.com>




Please see https://code.fluendo.com/elisa/trac/changeset/4785 for details about this commit!
Diff of the changeset appears below:

--- trunk/ChangeLog 
+++ trunk/ChangeLog 
@@ -1,3 +1,9 @@
+2008-01-29  Alessandro Decina <alessandro at fluendo.com>
+	
+	* elisa/plugins/good/gstreamer_plugin/gst_metadata.py:
+	Put videoscale after RawImageVarianceFilter.
+	Set proper caps on pad templates.
+
 2008-01-29  Lionel Martin  <lionel at fluendo.com>
 
 	* setup.py:
--- trunk/elisa/plugins/good/gstreamer_plugin/gst_metadata.py 
+++ trunk/elisa/plugins/good/gstreamer_plugin/gst_metadata.py 
@@ -94,7 +94,7 @@
         self._videoscale = gst.element_factory_make('videoscale')
         self._capsfilter = gst.element_factory_make('capsfilter')
         # FIXME: hardcoded caps
-        caps = gst.Caps('video/x-raw-rgb,width=256,height=256')
+        caps = gst.Caps('video/x-raw-rgb,width=(int)256,height=(int)256')
         self._capsfilter.props.caps = caps
         self._tee = gst.element_factory_make('tee')
         self._queue0 = gst.element_factory_make('queue')
@@ -131,8 +131,8 @@
         pad = self._tee.get_request_pad('src%d')
         pad.link(self._queue1.get_pad('sink'))
 
-        gst.element_link_many(self._queue1, self._videoscale,
-                self._capsfilter, self._filter, self._encoder)
+        gst.element_link_many(self._queue1,
+                self._filter, self._videoscale, self._capsfilter, self._encoder)
 
     def do_get_property(self, pspec):
         return getattr(self, '_' + pspec.name)
@@ -147,28 +147,23 @@
         return buffer
 
 class PngImageSnapshotBin(ImageSnapshotMixIn, gst.Bin, Loggable):
-    # FIXME: fix the caps
+    sink_template = gst.PadTemplate('sink',
+            gst.PAD_SINK, gst.PAD_ALWAYS,
+            gst.Caps('video/x-raw-rgb, '
+                    'bpp = (int) 24, '
+                    'depth = (int) 24'))
+    
     src_template = gst.PadTemplate('src',
             gst.PAD_SRC, gst.PAD_ALWAYS,
-            gst.caps_new_any())
-    
-    # FIXME: fix the caps
-    sink_template = gst.PadTemplate('sink',
-            gst.PAD_SINK, gst.PAD_ALWAYS,
-            gst.caps_new_any())
-
-    """
+            gst.Caps('video/x-raw-rgb, '
+                    'bpp = (int) 24, '
+                    'depth = (int) 24'))
+
     snapshot_template = gst.PadTemplate('snapshot',
             gst.PAD_SRC, gst.PAD_ALWAYS,
             gst.Caps('image/png, '
                     'width = [16, 4096], '
-                    'height = [16, 4096], '
-                    'framerate = [0/1, 2147483647/1]'))
-    """
-    # FIXME: fix the caps
-    snapshot_template = gst.PadTemplate('snapshot',
-            gst.PAD_SRC, gst.PAD_ALWAYS,
-            gst.caps_new_any())
+                    'height = [16, 4096]'))
 
     __gproperties__ = ImageSnapshotMixIn.__gproperties__
 
@@ -183,28 +178,24 @@
         return element
 
 class PngVideoSnapshotBin(ImageSnapshotMixIn, gst.Bin, Loggable):
-    # FIXME: fix the caps
+    sink_template = gst.PadTemplate('sink',
+            gst.PAD_SINK, gst.PAD_ALWAYS,
+            gst.Caps('video/x-raw-rgb, '
+                    'bpp = (int) 24, '
+                    'depth = (int)24'))
+    
     src_template = gst.PadTemplate('src',
             gst.PAD_SRC, gst.PAD_ALWAYS,
-            gst.caps_new_any())
-    
-    # FIXME: fix the caps
-    sink_template = gst.PadTemplate('sink',
-            gst.PAD_SINK, gst.PAD_ALWAYS,
-            gst.caps_new_any())
-
-    """
+            gst.Caps('video/x-raw-rgb, '
+                    'bpp = (int) 24, '
+                    'depth = (int) 24'))
+    
     snapshot_template = gst.PadTemplate('snapshot',
             gst.PAD_SRC, gst.PAD_ALWAYS,
             gst.Caps('image/png, '
                     'width = [16, 4096], '
-                    'height = [16, 4096], '
-                    'framerate = [0/1, 2147483647/1]'))
-    """
-    # FIXME: fix the caps
-    snapshot_template = gst.PadTemplate('snapshot',
-            gst.PAD_SRC, gst.PAD_ALWAYS,
-            gst.caps_new_any())
+                    'height = [16, 4096]'))
+
 
     __gproperties__ = ImageSnapshotMixIn.__gproperties__
     
@@ -247,7 +238,6 @@
                 gobject.TYPE_NONE, (gst.Buffer.__gtype__,))
     }
 
-    # FIXME: set the caps
     sink_template = gst.PadTemplate('sink',
             gst.PAD_SINK, gst.PAD_ALWAYS,
             gst.Caps('video/x-raw-rgb, '
@@ -380,7 +370,7 @@
 class GstMetadataPipeline(Loggable):
     reuse_elements = True
     timeout = 2
-    thumb_timeout = 2
+    thumb_timeout = 1
     
     def __init__(self):
         super(GstMetadataPipeline, self).__init__()
@@ -454,7 +444,7 @@
         self._src = gst.element_factory_make('filesrc')
         # FIXME: workaround for jpegdec that does a gst_buffer_join for each
         # gst_pad_chain.
-        self._src.props.blocksize = 2 * 1024 * 1024
+        self._src.props.blocksize = 1024 * 1024
         self._typefind = gst.element_factory_make('typefind')
         self._typefind.connect('have-type', self._typefind_have_type_cb)
         pad = self._typefind.get_pad('src')


Feel free to slap alessandro if he did something wrong. I'm not
able to determine that.

Cheers,
Linda