mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

adder: improve caps filter functionality. Fixes #590146.

Browse source 
Also use the capsfilter if there is no src-peer as the caps constrain what
we can do. Don't create any_caps as a default, as we check for NULL to skip the
filtering. This is a (small) performance regression as we always intersect
otherwise.
This commit is contained in:
Stefan Kost 2009-08-31 22:48:01 +03:00
parent 2194166e05
commit e7368354d5
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/adder/gstadder.c
View file

@ -244,6 +244,7 @@ gst_adder_sink_getcaps (GstPad * pad)
if (peercaps) { if (peercaps) {
/* restrict with filter-caps if any */ /* restrict with filter-caps if any */
if (adder->filter_caps) { if (adder->filter_caps) {
GST_DEBUG_OBJECT (adder, "filtering peer caps");
result = gst_caps_intersect (peercaps, adder->filter_caps); result = gst_caps_intersect (peercaps, adder->filter_caps);
gst_caps_unref (peercaps); gst_caps_unref (peercaps);
peercaps = result; peercaps = result;
@ -256,8 +257,15 @@ gst_adder_sink_getcaps (GstPad * pad)
} else { } else {
/* the peer has no caps (or there is no peer), just use the allowed caps /* the peer has no caps (or there is no peer), just use the allowed caps
* of this sinkpad. */ * of this sinkpad. */
GST_DEBUG_OBJECT (adder, "no peer caps, using sinkcaps"); /* restrict with filter-caps if any */
result = sinkcaps; if (adder->filter_caps) {
GST_DEBUG_OBJECT (adder, "no peer caps, using filtered sinkcaps");
result = gst_caps_intersect (sinkcaps, adder->filter_caps);
gst_caps_unref (sinkcaps);
} else {
GST_DEBUG_OBJECT (adder, "no peer caps, using sinkcaps");
result = sinkcaps;
}
} }
GST_OBJECT_UNLOCK (adder); GST_OBJECT_UNLOCK (adder);
@ -868,7 +876,7 @@ gst_adder_init (GstAdder * adder)
adder->padcount = 0; adder->padcount = 0;
adder->func = NULL; adder->func = NULL;
adder->filter_caps = gst_caps_new_any (); adder->filter_caps = NULL;
/* keep track of the sinkpads requested */ /* keep track of the sinkpads requested */
adder->collect = gst_collect_pads_new (); adder->collect = gst_collect_pads_new ();
@ -903,13 +911,11 @@ gst_adder_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_FILTER_CAPS:{ case PROP_FILTER_CAPS:{
GstCaps *new_caps; GstCaps *new_caps = NULL;
GstCaps *old_caps; GstCaps *old_caps;
const GstCaps *new_caps_val = gst_value_get_caps (value); const GstCaps *new_caps_val = gst_value_get_caps (value);
if (new_caps_val == NULL) { if (new_caps_val != NULL) {
new_caps = gst_caps_new_any ();
} else {
new_caps = (GstCaps *) new_caps_val; new_caps = (GstCaps *) new_caps_val;
gst_caps_ref (new_caps); gst_caps_ref (new_caps);
} }
@ -919,7 +925,8 @@ gst_adder_set_property (GObject * object, guint prop_id,
adder->filter_caps = new_caps; adder->filter_caps = new_caps;
GST_OBJECT_UNLOCK (adder); GST_OBJECT_UNLOCK (adder);
gst_caps_unref (old_caps); if (old_caps)
gst_caps_unref (old_caps);
GST_DEBUG_OBJECT (adder, "set new caps %" GST_PTR_FORMAT, new_caps); GST_DEBUG_OBJECT (adder, "set new caps %" GST_PTR_FORMAT, new_caps);
break; break;