mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-01 01:33:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad: use new _caps_can_intersect()

Browse source
This commit is contained in:
Stefan Kost 2009-07-22 11:24:08 +03:00
parent 04470fc794
commit aee208ff30
1 changed files with 7 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gst/gstpad.c
View file

@ -1756,7 +1756,7 @@ gst_pad_link_check_compatible_unlocked (GstPad * src, GstPad * sink)
{ {
GstCaps *srccaps; GstCaps *srccaps;
GstCaps *sinkcaps; GstCaps *sinkcaps;
GstCaps *icaps; gboolean compatible = FALSE;
srccaps = gst_pad_get_caps_unlocked (src); srccaps = gst_pad_get_caps_unlocked (src);
sinkcaps = gst_pad_get_caps_unlocked (sink); sinkcaps = gst_pad_get_caps_unlocked (sink);
@ -1774,36 +1774,15 @@ gst_pad_link_check_compatible_unlocked (GstPad * src, GstPad * sink)
goto done; goto done;
} }
icaps = gst_caps_intersect (srccaps, sinkcaps); compatible = gst_caps_can_intersect (srccaps, sinkcaps);
gst_caps_unref (srccaps); gst_caps_unref (srccaps);
gst_caps_unref (sinkcaps); gst_caps_unref (sinkcaps);
if (icaps == NULL)
goto was_null;
GST_CAT_DEBUG (GST_CAT_CAPS,
"intersection caps %p %" GST_PTR_FORMAT, icaps, icaps);
if (gst_caps_is_empty (icaps))
goto was_empty;
gst_caps_unref (icaps);
done: done:
return TRUE; GST_CAT_DEBUG (GST_CAT_CAPS, "caps are %scompatible",
(compatible ? "" : "not"));
/* incompatible cases */ return compatible;
was_null:
{
GST_CAT_DEBUG (GST_CAT_CAPS, "intersection gave NULL");
return FALSE;
}
was_empty:
{
GST_CAT_DEBUG (GST_CAT_CAPS, "intersection is EMPTY");
gst_caps_unref (icaps);
return FALSE;
}
} }
/* check if the grandparents of both pads are the same. /* check if the grandparents of both pads are the same.
@ -2371,9 +2350,7 @@ gst_pad_fixate_caps (GstPad * pad, GstCaps * caps)
static gboolean static gboolean
gst_pad_acceptcaps_default (GstPad * pad, GstCaps * caps) gst_pad_acceptcaps_default (GstPad * pad, GstCaps * caps)
{ {
/* get the caps and see if it intersects to something /* get the caps and see if it intersects to something not empty */
* not empty */
GstCaps *intersect;
GstCaps *allowed; GstCaps *allowed;
gboolean result = FALSE; gboolean result = FALSE;
@ -2385,14 +2362,9 @@ gst_pad_acceptcaps_default (GstPad * pad, GstCaps * caps)
GST_DEBUG_OBJECT (pad, "allowed caps %" GST_PTR_FORMAT, allowed); GST_DEBUG_OBJECT (pad, "allowed caps %" GST_PTR_FORMAT, allowed);
intersect = gst_caps_intersect (allowed, caps); result = gst_caps_can_intersect (allowed, caps);
GST_DEBUG_OBJECT (pad, "intersection %" GST_PTR_FORMAT, intersect);
result = !gst_caps_is_empty (intersect);
gst_caps_unref (allowed); gst_caps_unref (allowed);
gst_caps_unref (intersect);
return result; return result;