mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

basetransform: use new _caps_can_intersect()

Browse source
This commit is contained in:
Stefan Kost 2009-07-22 09:54:55 +03:00
parent 568202cb47
commit 04470fc794
1 changed files with 25 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
libs/gst/base/gstbasetransform.c
View file

@ -719,7 +719,7 @@ gst_base_transform_can_transform (GstBaseTransform * trans, GstPad * pad,
goto no_transform; goto no_transform;
/* check if the out caps is a subset of the othercaps */ /* check if the out caps is a subset of the othercaps */
if (!gst_caps_is_subset (out, othercaps)) if (!gst_caps_can_intersect (out, othercaps))
goto no_subset; goto no_subset;
if (othercaps) if (othercaps)
@ -814,43 +814,36 @@ gst_base_transform_find_transform (GstBaseTransform * trans, GstPad * pad,
* fixed caps */ * fixed caps */
is_fixed = gst_caps_is_fixed (othercaps); is_fixed = gst_caps_is_fixed (othercaps);
if (!is_fixed) { if (!is_fixed) {
GstCaps *temp;
GST_DEBUG_OBJECT (trans, GST_DEBUG_OBJECT (trans,
"transform returned non fixed %" GST_PTR_FORMAT, othercaps); "transform returned non fixed %" GST_PTR_FORMAT, othercaps);
/* see if the target caps are a superset of the source caps, in this /* see if the target caps are a superset of the source caps, in this
* case we can try to perform passthrough */ * case we can try to perform passthrough */
temp = gst_caps_intersect (othercaps, caps); if (gst_caps_can_intersect (othercaps, caps)) {
GST_DEBUG_OBJECT (trans, "intersect returned %" GST_PTR_FORMAT, temp); GST_DEBUG_OBJECT (trans, "try passthrough with %" GST_PTR_FORMAT, caps);
if (temp) { if (otherpeer) {
if (!gst_caps_is_empty (temp)) { /* try passthrough. we know it's fixed, because caps is fixed */
GST_DEBUG_OBJECT (trans, "try passthrough with %" GST_PTR_FORMAT, caps); if (gst_pad_accept_caps (otherpeer, caps)) {
if (otherpeer) { GST_DEBUG_OBJECT (trans, "peer accepted %" GST_PTR_FORMAT, caps);
/* try passthrough. we know it's fixed, because caps is fixed */ /* peer accepted unmodified caps, we free the original non-fixed
if (gst_pad_accept_caps (otherpeer, caps)) { * caps and work with the passthrough caps */
GST_DEBUG_OBJECT (trans, "peer accepted %" GST_PTR_FORMAT, caps);
/* peer accepted unmodified caps, we free the original non-fixed
* caps and work with the passthrough caps */
gst_caps_unref (othercaps);
othercaps = gst_caps_ref (caps);
is_fixed = TRUE;
/* mark that we checked othercaps with the peer, this
* makes sure we don't call accept_caps again with these same
* caps */
peer_checked = TRUE;
} else {
GST_DEBUG_OBJECT (trans,
"peer did not accept %" GST_PTR_FORMAT, caps);
}
} else {
GST_DEBUG_OBJECT (trans, "no peer, doing passthrough");
gst_caps_unref (othercaps); gst_caps_unref (othercaps);
othercaps = gst_caps_ref (caps); othercaps = gst_caps_ref (caps);
is_fixed = TRUE; is_fixed = TRUE;
/* mark that we checked othercaps with the peer, this
* makes sure we don't call accept_caps again with these same
* caps */
peer_checked = TRUE;
} else {
GST_DEBUG_OBJECT (trans,
"peer did not accept %" GST_PTR_FORMAT, caps);
} }
} else {
GST_DEBUG_OBJECT (trans, "no peer, doing passthrough");
gst_caps_unref (othercaps);
othercaps = gst_caps_ref (caps);
is_fixed = TRUE;
} }
gst_caps_unref (temp);
} }
} }
@ -1004,7 +997,7 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps)
if (!gst_caps_is_fixed (caps)) if (!gst_caps_is_fixed (caps))
#endif #endif
{ {
GstCaps *allowed, *intersect; GstCaps *allowed;
GST_DEBUG_OBJECT (pad, "non fixed accept caps %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (pad, "non fixed accept caps %" GST_PTR_FORMAT, caps);
@ -1018,13 +1011,7 @@ gst_base_transform_acceptcaps (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 with the requested format */ /* intersect with the requested format */
intersect = gst_caps_intersect (allowed, caps); ret = gst_caps_can_intersect (allowed, caps);
GST_DEBUG_OBJECT (pad, "intersection %" GST_PTR_FORMAT, intersect);
/* we can accept if the intersection is not empty */
ret = !gst_caps_is_empty (intersect);
gst_caps_unref (intersect);
gst_caps_unref (allowed); gst_caps_unref (allowed);
if (!ret) if (!ret)
@ -1560,10 +1547,6 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
size_suggest = size; size_suggest = size;
suggest = FALSE; suggest = FALSE;
} else { } else {
GstCaps *temp;
const GstCaps *templ;
gboolean empty;
GST_DEBUG_OBJECT (trans, "new format %p %" GST_PTR_FORMAT, caps, caps); GST_DEBUG_OBJECT (trans, "new format %p %" GST_PTR_FORMAT, caps, caps);
/* if we have a suggestion, pretend we got these as input */ /* if we have a suggestion, pretend we got these as input */
@ -1588,13 +1571,9 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
/* check if we actually handle this format on the sinkpad */ /* check if we actually handle this format on the sinkpad */
if (sink_suggest) { if (sink_suggest) {
templ = gst_pad_get_pad_template_caps (pad); const GstCaps *templ = gst_pad_get_pad_template_caps (pad);
temp = gst_caps_intersect (sink_suggest, templ);
empty = gst_caps_is_empty (temp); if (!gst_caps_can_intersect (sink_suggest, templ))
gst_caps_unref (temp);
if (empty)
goto not_supported; goto not_supported;
} }