mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

basetransform: Refactor gst_base_transform_buffer_alloc() code

Browse source 
Don't check if upstream provided caps are compatible with upstream
and don't try to fixate these caps. They must be fixated in any case.
This commit is contained in:
Sebastian Dröge 2011-12-08 17:02:28 +01:00
parent e7b3305f70
commit 26a1ac0ce7
1 changed files with 102 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1828,7 +1828,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
GstBaseTransformPrivate *priv; GstBaseTransformPrivate *priv;
GstFlowReturn res; GstFlowReturn res;
gboolean alloced = FALSE; gboolean alloced = FALSE;
gboolean proxy, suggest, same_caps; gboolean proxy, suggest, new_caps;
GstCaps *sink_suggest = NULL; GstCaps *sink_suggest = NULL;
guint size_suggest; guint size_suggest;
@ -1850,32 +1850,33 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
/* we remember our previous alloc request to quickly see if we can proxy or /* we remember our previous alloc request to quickly see if we can proxy or
* not. We skip this check if we have a pending suggestion. */ * not. We skip this check if we have a pending suggestion. */
GST_OBJECT_LOCK (pad); GST_OBJECT_LOCK (pad);
same_caps = !priv->suggest_pending && caps && suggest = priv->suggest_pending;
gst_caps_is_equal (priv->sink_alloc, caps);
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
if (same_caps) { if (!suggest) {
/* we have seen this before, see below if we need to proxy */ /* we have no suggestion, see below if we need to proxy */
GST_DEBUG_OBJECT (trans, "have old caps %p, size %u", caps, size);
gst_caps_replace (&sink_suggest, caps); gst_caps_replace (&sink_suggest, caps);
size_suggest = size; size_suggest = size;
suggest = FALSE; suggest = FALSE;
} else { new_caps = sink_suggest
GST_DEBUG_OBJECT (trans, "new format %p %" GST_PTR_FORMAT, caps, caps); && !gst_caps_is_equal (sink_suggest, priv->sink_alloc);
if (new_caps)
GST_DEBUG_OBJECT (trans, "new format %p %" GST_PTR_FORMAT, caps, caps);
else
GST_DEBUG_OBJECT (trans, "have old caps %p, size %u", caps, size);
} else {
/* if we have a suggestion, pretend we got these as input */ /* if we have a suggestion, pretend we got these as input */
GST_OBJECT_LOCK (pad); GST_OBJECT_LOCK (pad);
if ((priv->sink_suggest && !gst_caps_is_equal (caps, priv->sink_suggest))) { if (priv->sink_suggest && !gst_caps_is_equal (caps, priv->sink_suggest)) {
sink_suggest = gst_caps_ref (priv->sink_suggest); sink_suggest = gst_caps_ref (priv->sink_suggest);
size_suggest = priv->size_suggest; size_suggest = priv->size_suggest;
GST_DEBUG_OBJECT (trans, "have suggestion %p %" GST_PTR_FORMAT " size %u", GST_DEBUG_OBJECT (trans, "have suggestion %p %" GST_PTR_FORMAT " size %u",
sink_suggest, sink_suggest, priv->size_suggest); sink_suggest, sink_suggest, priv->size_suggest);
/* suggest is TRUE when we have a custom suggestion pending that we need
* to unref later. */
suggest = TRUE;
} else { } else {
GST_DEBUG_OBJECT (trans, "using caps %p %" GST_PTR_FORMAT " size %u", GST_DEBUG_OBJECT (trans,
caps, caps, size); "have suggestion equal to upstream caps %p %" GST_PTR_FORMAT, caps,
caps);
gst_caps_replace (&sink_suggest, caps); gst_caps_replace (&sink_suggest, caps);
size_suggest = size; size_suggest = size;
suggest = FALSE; suggest = FALSE;
@ -1884,8 +1885,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
/* check if we actually handle this format on the sinkpad */ /* check if we actually handle this format on the sinkpad */
if (sink_suggest) { if (suggest) {
const GstCaps *templ;
GstCaps *peercaps; GstCaps *peercaps;
/* Always intersect with the peer caps to get correct /* Always intersect with the peer caps to get correct
@ -1944,90 +1944,95 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
GST_DEBUG_OBJECT (trans, "Caps fixed to: %" GST_PTR_FORMAT, GST_DEBUG_OBJECT (trans, "Caps fixed to: %" GST_PTR_FORMAT,
sink_suggest); sink_suggest);
} }
/* Check if the suggested caps are compatible with our
* sinkpad template caps and if they're not (or were
* empty after intersecting with the peer caps above)
* we try to come up with any supported caps
*/
if (sink_suggest) {
templ = gst_pad_get_pad_template_caps (pad);
if (!gst_caps_can_intersect (sink_suggest, templ)) {
GstCaps *allowed;
GstCaps *peercaps;
GST_DEBUG_OBJECT (trans,
"Requested pad alloc caps are not supported: %" GST_PTR_FORMAT,
sink_suggest);
/* the requested pad alloc caps are not supported, so let's try
* picking something allowed between the pads (they are linked,
* there must be something) */
allowed = gst_pad_get_allowed_caps (pad);
if (allowed && !gst_caps_is_empty (allowed)) {
GST_DEBUG_OBJECT (trans,
"pads could agree on one of the following caps: " "%"
GST_PTR_FORMAT, allowed);
allowed = gst_caps_make_writable (allowed);
if (klass->fixate_caps) {
peercaps =
gst_pad_get_allowed_caps (GST_BASE_TRANSFORM_SRC_PAD (trans));
klass->fixate_caps (trans, GST_PAD_SRC, peercaps, allowed);
gst_caps_unref (peercaps);
}
/* Fixate them to be safe if the subclass didn't do it */
gst_caps_truncate (allowed);
gst_pad_fixate_caps (pad, allowed);
gst_caps_replace (&sink_suggest, allowed);
gst_caps_unref (allowed);
suggest = TRUE;
GST_DEBUG_OBJECT (trans, "Fixated suggestion caps to %"
GST_PTR_FORMAT, sink_suggest);
} else {
if (allowed)
gst_caps_unref (allowed);
goto not_supported;
}
}
}
} }
/* find the best format for the other side here we decide if we will proxy new_caps = sink_suggest
* the caps or not. */ && !gst_caps_is_equal (sink_suggest, priv->sink_alloc);
if (sink_suggest == NULL) { }
/* always proxy when the caps are NULL. When this is a new format, see if
* we can proxy it downstream */
GST_DEBUG_OBJECT (trans, "null caps, marking for proxy");
priv->proxy_alloc = TRUE;
} else {
GstCaps *othercaps;
/* we have a new format, see what we need to proxy to */ /* Check if the new caps are compatible with our
othercaps = gst_base_transform_find_transform (trans, pad, sink_suggest); * sinkpad template caps and if they're not
if (!othercaps || gst_caps_is_empty (othercaps)) { * we try to come up with any supported caps
/* no transform possible, we certainly can't proxy */ */
GST_DEBUG_OBJECT (trans, "can't find transform, disable proxy"); if (new_caps) {
priv->proxy_alloc = FALSE; const GstCaps *templ;
} else {
/* we transformed into something */ templ = gst_pad_get_pad_template_caps (pad);
if (gst_caps_is_equal (sink_suggest, othercaps)) {
GST_DEBUG_OBJECT (trans, if (!gst_caps_can_intersect (sink_suggest, templ)) {
"best caps same as input, marking for proxy"); GstCaps *allowed;
priv->proxy_alloc = TRUE; GstCaps *peercaps;
} else {
GST_DEBUG_OBJECT (trans, GST_DEBUG_OBJECT (trans,
"best caps different from input, disable proxy"); "Requested pad alloc caps are not supported: %" GST_PTR_FORMAT,
priv->proxy_alloc = FALSE; sink_suggest);
/* the requested pad alloc caps are not supported, so let's try
* picking something allowed between the pads (they are linked,
* there must be something) */
allowed = gst_pad_get_allowed_caps (pad);
if (allowed && !gst_caps_is_empty (allowed)) {
GST_DEBUG_OBJECT (trans,
"pads could agree on one of the following caps: " "%"
GST_PTR_FORMAT, allowed);
allowed = gst_caps_make_writable (allowed);
if (klass->fixate_caps) {
peercaps =
gst_pad_get_allowed_caps (GST_BASE_TRANSFORM_SRC_PAD (trans));
klass->fixate_caps (trans, GST_PAD_SRC, peercaps, allowed);
gst_caps_unref (peercaps);
} }
/* Fixate them to be safe if the subclass didn't do it */
gst_caps_truncate (allowed);
gst_pad_fixate_caps (pad, allowed);
gst_caps_replace (&sink_suggest, allowed);
gst_caps_unref (allowed);
suggest = TRUE;
new_caps = !gst_caps_is_equal (sink_suggest, priv->sink_alloc);
GST_DEBUG_OBJECT (trans, "Fixated suggestion caps to %"
GST_PTR_FORMAT, sink_suggest);
} else {
if (allowed)
gst_caps_unref (allowed);
goto not_supported;
} }
if (othercaps)
gst_caps_unref (othercaps);
} }
} }
/* find the best format for the other side here we decide if we will proxy
* the caps or not. */
if (sink_suggest == NULL) {
/* always proxy when the caps are NULL. When this is a new format, see if
* we can proxy it downstream */
GST_DEBUG_OBJECT (trans, "null caps, marking for proxy");
priv->proxy_alloc = TRUE;
} else if (new_caps) {
GstCaps *othercaps;
/* we have a new format, see what we need to proxy to */
othercaps = gst_base_transform_find_transform (trans, pad, sink_suggest);
if (!othercaps || gst_caps_is_empty (othercaps)) {
/* no transform possible, we certainly can't proxy */
GST_DEBUG_OBJECT (trans, "can't find transform, disable proxy");
priv->proxy_alloc = FALSE;
} else {
/* we transformed into something */
if (gst_caps_is_equal (sink_suggest, othercaps)) {
GST_DEBUG_OBJECT (trans, "best caps same as input, marking for proxy");
priv->proxy_alloc = TRUE;
} else {
GST_DEBUG_OBJECT (trans,
"best caps different from input, disable proxy");
priv->proxy_alloc = FALSE;
}
}
if (othercaps)
gst_caps_unref (othercaps);
}
/* remember the new caps */ /* remember the new caps */
GST_OBJECT_LOCK (pad); GST_OBJECT_LOCK (pad);
gst_caps_replace (&priv->sink_alloc, sink_suggest); gst_caps_replace (&priv->sink_alloc, sink_suggest);
@ -2079,9 +2084,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
} else { } else {
GST_DEBUG_OBJECT (trans, "received required caps from peer"); GST_DEBUG_OBJECT (trans, "received required caps from peer");
} }
} } else if (suggest) {
if (suggest) {
/* there was a custom suggestion, create a buffer of this format and return /* there was a custom suggestion, create a buffer of this format and return
* it. Note that this format */ * it. Note that this format */
*buf = gst_buffer_new_and_alloc (size_suggest); *buf = gst_buffer_new_and_alloc (size_suggest);
@ -2090,6 +2093,9 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
sink_suggest, sink_suggest); sink_suggest, sink_suggest);
GST_BUFFER_CAPS (*buf) = sink_suggest; GST_BUFFER_CAPS (*buf) = sink_suggest;
sink_suggest = NULL; sink_suggest = NULL;
} else {
/* fallback buffer allocation by gst_pad_alloc_buffer() with the
* caps and size provided by the caller */
} }
if (sink_suggest) if (sink_suggest)