FCL/sf/mw/gstreamer: comparison gstreamer_core/plugins/elements/gstcapsfilter.c

equal deleted inserted replaced

-:9b2c3c7a1a9c
+:567bb019e3e3
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:element-capsfilter
-* @short_description: pass data though unmodified, but enforces format limmits
 *
-* The element does not modify data as such, but can enforce limmitations on the
+* The element does not modify data as such, but can enforce limitations on the
 * data format.
 */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #ifdef __SYMBIAN32__
 #include <gst_global.h>
 #endif
 #include "../../gst/gst-i18n-lib.h"
 #include "gstcapsfilter.h"
+#include <glib_global.h>
-#ifdef __SYMBIAN32__
-#include <gstelement.h>
-#endif
 enum
 {
 PROP_0,
 PROP_FILTER_CAPS
 };
 static void gst_capsfilter_set_property (GObject * object, guint prop_id,
 const GValue * value, GParamSpec * pspec);
 static void gst_capsfilter_get_property (GObject * object, guint prop_id,
 GValue * value, GParamSpec * pspec);
 static void gst_capsfilter_dispose (GObject * object);
 static GstCaps *gst_capsfilter_transform_caps (GstBaseTransform * base,
 GstPadDirection direction, GstCaps * caps);
 static GstFlowReturn gst_capsfilter_transform_ip (GstBaseTransform * base,
 GstBuffer * buf);
 static GstFlowReturn gst_capsfilter_prepare_buf (GstBaseTransform * trans,
 g_object_class_install_property (gobject_class, PROP_FILTER_CAPS,
 g_param_spec_boxed ("caps", _("Filter caps"),
 _("Restrict the possible allowed capabilities (NULL means ANY). "
 "Setting this property takes a reference to the supplied GstCaps "
-"object."), GST_TYPE_CAPS, G_PARAM_READWRITE));
+"object."), GST_TYPE_CAPS,
+G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 trans_class = GST_BASE_TRANSFORM_CLASS (klass);
 trans_class->transform_caps = gst_capsfilter_transform_caps;
 trans_class->transform_ip = gst_capsfilter_transform_ip;
 trans_class->prepare_output_buffer = gst_capsfilter_prepare_buf;
 }
 static void
 gst_capsfilter_init (GstCapsFilter * filter, GstCapsFilterClass * g_class)
 {
+GstBaseTransform *trans = GST_BASE_TRANSFORM (filter);
+gst_base_transform_set_gap_aware (trans, TRUE);
 filter->filter_caps = gst_caps_new_any ();
+}
+static gboolean
+copy_func (GQuark field_id, const GValue * value, GstStructure * dest)
+{
+gst_structure_id_set_value (dest, field_id, value);
+return TRUE;
 }
 static void
 gst_capsfilter_set_property (GObject * object, guint prop_id,
 const GValue * value, GParamSpec * pspec)
 GstCapsFilter *capsfilter = GST_CAPSFILTER (object);
 switch (prop_id) {
 case PROP_FILTER_CAPS:{
 GstCaps *new_caps;
-GstCaps *old_caps;
+GstCaps *old_caps, *suggest, *nego;
 const GstCaps *new_caps_val = gst_value_get_caps (value);
 if (new_caps_val == NULL) {
 new_caps = gst_caps_new_any ();
 } else {
 new_caps = (GstCaps *) new_caps_val;
 gst_caps_ref (new_caps);
 }
+GST_OBJECT_LOCK (capsfilter);
 old_caps = capsfilter->filter_caps;
 capsfilter->filter_caps = new_caps;
+GST_OBJECT_UNLOCK (capsfilter);
 gst_caps_unref (old_caps);
 GST_DEBUG_OBJECT (capsfilter, "set new caps %" GST_PTR_FORMAT, new_caps);
-/* FIXME: Need to activate these caps on the pads
+/* filter the currently negotiated format against the new caps */
-* http://bugzilla.gnome.org/show_bug.cgi?id=361718
+GST_OBJECT_LOCK (GST_BASE_TRANSFORM_SINK_PAD (object));
-*/
+nego = GST_PAD_CAPS (GST_BASE_TRANSFORM_SINK_PAD (object));
+if (nego) {
+GST_DEBUG_OBJECT (capsfilter, "we had negotiated caps %" GST_PTR_FORMAT,
+nego);
+if (G_UNLIKELY (gst_caps_is_any (new_caps))) {
+GST_DEBUG_OBJECT (capsfilter, "not settings any suggestion");
+suggest = NULL;
+} else {
+GstStructure *s1, *s2;
+/* first check if the name is the same */
+s1 = gst_caps_get_structure (nego, 0);
+s2 = gst_caps_get_structure (new_caps, 0);
+if (gst_structure_get_name_id (s1) == gst_structure_get_name_id (s2)) {
+/* same name, copy all fields from the new caps into the previously
+* negotiated caps */
+suggest = gst_caps_copy (nego);
+s1 = gst_caps_get_structure (suggest, 0);
+gst_structure_foreach (s2, (GstStructureForeachFunc) copy_func, s1);
+GST_DEBUG_OBJECT (capsfilter, "copied structure fields");
+} else {
+GST_DEBUG_OBJECT (capsfilter, "different structure names");
+/* different names, we can only suggest the complete caps */
+suggest = gst_caps_copy (new_caps);
+}
+}
+} else {
+GST_DEBUG_OBJECT (capsfilter, "no negotiated caps");
+/* no previous caps, the getcaps function will be used to find suitable
+* caps */
+suggest = NULL;
+}
+GST_OBJECT_UNLOCK (GST_BASE_TRANSFORM_SINK_PAD (object));
+GST_DEBUG_OBJECT (capsfilter, "suggesting new caps %" GST_PTR_FORMAT,
+suggest);
+gst_base_transform_suggest (GST_BASE_TRANSFORM (object), suggest, 0);
+if (suggest)
+gst_caps_unref (suggest);
 break;
 }
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 break;
 {
 GstCapsFilter *capsfilter = GST_CAPSFILTER (object);
 switch (prop_id) {
 case PROP_FILTER_CAPS:
+GST_OBJECT_LOCK (capsfilter);
 gst_value_set_caps (value, capsfilter->filter_caps);
+GST_OBJECT_UNLOCK (capsfilter);
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 break;
 }
 static GstCaps *
 gst_capsfilter_transform_caps (GstBaseTransform * base,
 GstPadDirection direction, GstCaps * caps)
 {
 GstCapsFilter *capsfilter = GST_CAPSFILTER (base);
-GstCaps *ret;
+GstCaps *ret, *filter_caps;
-ret = gst_caps_intersect (caps, capsfilter->filter_caps);
+GST_OBJECT_LOCK (capsfilter);
+filter_caps = gst_caps_ref (capsfilter->filter_caps);
+GST_OBJECT_UNLOCK (capsfilter);
+ret = gst_caps_intersect (caps, filter_caps);
+GST_DEBUG_OBJECT (capsfilter, "input:     %" GST_PTR_FORMAT, caps);
+GST_DEBUG_OBJECT (capsfilter, "filter:    %" GST_PTR_FORMAT, filter_caps);
+GST_DEBUG_OBJECT (capsfilter, "intersect: %" GST_PTR_FORMAT, ret);
+gst_caps_unref (filter_caps);
 return ret;
 }
 static gboolean
 */
 static GstFlowReturn
 gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input,
 gint size, GstCaps * caps, GstBuffer ** buf)
 {
+GstFlowReturn ret = GST_FLOW_OK;
 if (GST_BUFFER_CAPS (input) != NULL) {
 /* Output buffer already has caps */
-GST_DEBUG_OBJECT (trans,
+GST_LOG_OBJECT (trans, "Input buffer already has caps (implicitely fixed)");
-"Input buffer already has caps (implicitely fixed)");
 /* FIXME : Move this behaviour to basetransform. The given caps are the ones
 * of the source pad, therefore our outgoing buffers should always have
 * those caps. */
 gst_buffer_set_caps (input, caps);
 gst_buffer_ref (input);
 GST_BUFFER_CAPS (*buf) = out_caps;
 if (GST_PAD_CAPS (trans->srcpad) == NULL)
 gst_pad_set_caps (trans->srcpad, out_caps);
 } else {
-GST_DEBUG_OBJECT (trans, "Have unfixed output caps %" GST_PTR_FORMAT,
+gchar *caps_str = gst_caps_to_string (out_caps);
-out_caps);
+GST_DEBUG_OBJECT (trans, "Cannot choose caps. Have unfixed output caps %"
+GST_PTR_FORMAT, out_caps);
 gst_caps_unref (out_caps);
+ret = GST_FLOW_ERROR;
+GST_ELEMENT_ERROR (trans, STREAM, FORMAT,
+("Filter caps do not completely specify the output format"),
+("Output caps are unfixed: %s", caps_str));
+g_free (caps_str);
 }
 }
-return GST_FLOW_OK;
+return ret;
 }

branch	RCL_3
changeset 29	567bb019e3e3
parent 0	0e761a78d257
child 30	7e817e7e631c