ext/libvisual/visual.c: Don't use gst_pad_use_fixed_caps, because it prevents downstr...

Original commit message from CVS:
* ext/libvisual/visual.c: (gst_visual_init),
(gst_vis_src_negotiate), (get_buffer), (plugin_init):
Don't use gst_pad_use_fixed_caps, because it prevents downstream from
being able to renegotiate the size. Instead, use the negotiation
algorithm from the goom plugin to pick an initial output caps.

Also, allow theoretical libvisual plugins that might support non-GL
output even if they also do GL.

diff --git a/ChangeLog b/ChangeLog
index a656e63..20fabf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-27  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * ext/libvisual/visual.c: (gst_visual_init),
+       (gst_vis_src_negotiate), (get_buffer), (plugin_init):
+       Don't use gst_pad_use_fixed_caps, because it prevents downstream from
+       being able to renegotiate the size. Instead, use the negotiation
+       algorithm from the goom plugin to pick an initial output caps. 
+
+       Also, allow theoretical libvisual plugins that might support non-GL 
+       output even if they also do GL.
+
 2006-02-26  Julien MOUTTE  <julien@moutte.net>
 
        * ext/libvisual/visual.c: (gst_visual_init),

diff --git a/ext/libvisual/visual.c b/ext/libvisual/visual.c
index 61b2cda..bc5ee2e 100644 (file)
--- a/ext/libvisual/visual.c
+++ b/ext/libvisual/visual.c
@@ -196,7 +196,6 @@ gst_visual_init (GstVisual * visual)
   visual->srcpad = gst_pad_new_from_static_template (&src_template, "src");
   gst_pad_set_setcaps_function (visual->srcpad, gst_visual_src_setcaps);
   gst_pad_set_getcaps_function (visual->srcpad, gst_visual_getcaps);
-  gst_pad_use_fixed_caps (visual->srcpad);
   gst_element_add_pad (GST_ELEMENT (visual), visual->srcpad);
 
   visual->next_ts = 0;
@@ -308,71 +307,66 @@ gst_visual_sink_setcaps (GstPad * pad, GstCaps * caps)
   return TRUE;
 }
 
-static GstFlowReturn
-get_buffer (GstVisual * visual, GstBuffer ** outbuf)
+static gboolean
+gst_vis_src_negotiate (GstVisual * visual)
 {
-  GstFlowReturn ret;
+  GstCaps *othercaps, *target, *intersect;
+  GstStructure *structure;
+  const GstCaps *templ;
 
-  if (GST_PAD_CAPS (visual->srcpad) == NULL) {
-    gint width, height, bpp;
-    GstStructure *s;
-    GstCaps *caps;
+  templ = gst_pad_get_pad_template_caps (visual->srcpad);
 
-    GST_DEBUG_OBJECT (visual, "no src caps defined yet, try to set some");
+  /* see what the peer can do */
+  othercaps = gst_pad_peer_get_caps (visual->srcpad);
+  if (othercaps) {
+    intersect = gst_caps_intersect (othercaps, templ);
+    gst_caps_unref (othercaps);
 
-    /* No output caps current set up. Try and pick some */
-    caps = gst_pad_get_allowed_caps (visual->srcpad);
+    if (gst_caps_is_empty (intersect))
+      goto no_format;
 
-    if (gst_caps_is_empty (caps)) {
-      GST_DEBUG_OBJECT (visual, "allowed caps are empty");
-      gst_caps_unref (caps);
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
+    target = gst_caps_copy_nth (intersect, 0);
+    gst_caps_unref (intersect);
+  } else {
+    target = gst_caps_ref ((GstCaps *) templ);
+  }
 
-    if (!gst_caps_is_fixed (caps)) {
-      /* OK, not fixed, fixate the width and height */
-      caps = gst_caps_make_writable (caps);
-      gst_caps_truncate (caps);
+  structure = gst_caps_get_structure (target, 0);
+  gst_structure_fixate_field_nearest_int (structure, "width", 320);
+  gst_structure_fixate_field_nearest_int (structure, "height", 240);
+  gst_structure_fixate_field_nearest_fraction (structure, "framerate", 30, 1);
 
-      s = gst_caps_get_structure (caps, 0);
+  gst_pad_set_caps (visual->srcpad, target);
+  gst_caps_unref (target);
 
-      gst_structure_fixate_field_nearest_int (s, "width", 320);
-      gst_structure_fixate_field_nearest_int (s, "height", 240);
-      gst_structure_fixate_field_nearest_fraction (s, "framerate", 25, 1);
+  return TRUE;
 
-      GST_DEBUG_OBJECT (visual, "fixating caps to %" GST_PTR_FORMAT, caps);
+no_format:
+  {
+    gst_caps_unref (intersect);
+    gst_caps_unref (othercaps);
+    return FALSE;
+  }
+}
 
-      gst_pad_fixate_caps (visual->srcpad, caps);
-    } else
-      s = gst_caps_get_structure (caps, 0);
+static GstFlowReturn
+get_buffer (GstVisual * visual, GstBuffer ** outbuf)
+{
+  GstFlowReturn ret;
 
-    GST_DEBUG_OBJECT (visual,
-        "Trying to alloc buffer with caps: %" GST_PTR_FORMAT, caps);
+  if (GST_PAD_CAPS (visual->srcpad) == NULL) {
+    if (!gst_vis_src_negotiate (visual))
+      return GST_FLOW_NOT_NEGOTIATED;
+  }
 
-    if (!gst_structure_get_int (s, "width", &width) ||
-        !gst_structure_get_int (s, "height", &height) ||
-        !gst_structure_get_int (s, "bpp", &bpp)) {
-      ret = FALSE;
-    } else {
-      ret =
-          gst_pad_alloc_buffer_and_set_caps (visual->srcpad,
-          GST_BUFFER_OFFSET_NONE, height * GST_ROUND_UP_4 (width) * bpp, caps,
-          outbuf);
-    }
+  GST_DEBUG_OBJECT (visual, "allocating output buffer with caps %"
+      GST_PTR_FORMAT, GST_PAD_CAPS (visual->srcpad));
 
-    if (GST_PAD_CAPS (visual->srcpad) == NULL)
-      gst_pad_set_caps (visual->srcpad, caps);
-    gst_caps_unref (caps);
-  } else {
-    GST_DEBUG_OBJECT (visual, "allocating output buffer with caps %"
-        GST_PTR_FORMAT, GST_PAD_CAPS (visual->srcpad));
-
-    ret =
-        gst_pad_alloc_buffer_and_set_caps (visual->srcpad,
-        GST_BUFFER_OFFSET_NONE,
-        visual->video->height * GST_ROUND_UP_4 (visual->video->width) *
-        visual->video->bpp, GST_PAD_CAPS (visual->srcpad), outbuf);
-  }
+  ret =
+      gst_pad_alloc_buffer_and_set_caps (visual->srcpad,
+      GST_BUFFER_OFFSET_NONE,
+      visual->video->height * GST_ROUND_UP_4 (visual->video->width) *
+      visual->video->bpp, GST_PAD_CAPS (visual->srcpad), outbuf);
 
   if (ret != GST_FLOW_OK)
     return ret;
@@ -587,7 +581,8 @@ plugin_init (GstPlugin * plugin)
 
     actplugin = VISUAL_PLUGIN_ACTOR (visplugin->info->plugin);
 
-    if ((actplugin->depth & VISUAL_VIDEO_DEPTH_GL) > 0) {
+    /* Ignore plugins that only support GL output for now */
+    if (actplugin->depth == VISUAL_VIDEO_DEPTH_GL) {
       GST_DEBUG ("plugin %s is a GL plugin (%d), ignoring",
           ref->info->plugname, actplugin->depth);
       is_gl = TRUE;