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: Refactor caps suggestion on pad_alloc

Browse source 
Refactor the handling of sink suggestion caps variable
so that it always has a ref to the caps it points to.

Makes the code clearer.
This commit is contained in:
Thiago Santos 2010-03-28 20:55:09 -03:00
parent 477a5d0939
commit 7558fed51b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1524,7 +1524,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
GstBaseTransformPrivate *priv; GstBaseTransformPrivate *priv;
GstFlowReturn res; GstFlowReturn res;
gboolean proxy, suggest, same_caps; gboolean proxy, suggest, same_caps;
GstCaps *sink_suggest; GstCaps *sink_suggest = NULL;
guint size_suggest; guint size_suggest;
trans = GST_BASE_TRANSFORM (gst_pad_get_parent (pad)); trans = GST_BASE_TRANSFORM (gst_pad_get_parent (pad));
@ -1549,7 +1549,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
if (same_caps) { if (same_caps) {
/* we have seen this before, see below if we need to proxy */ /* we have seen this before, see below if we need to proxy */
GST_DEBUG_OBJECT (trans, "have old caps %p, size %u", caps, size); GST_DEBUG_OBJECT (trans, "have old caps %p, size %u", caps, size);
sink_suggest = caps; gst_caps_replace (&sink_suggest, caps);
size_suggest = size; size_suggest = size;
suggest = FALSE; suggest = FALSE;
} else { } else {
@ -1568,7 +1568,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
} else { } else {
GST_DEBUG_OBJECT (trans, "using caps %p %" GST_PTR_FORMAT " size %u", GST_DEBUG_OBJECT (trans, "using caps %p %" GST_PTR_FORMAT " size %u",
caps, caps, size); caps, caps, size);
sink_suggest = caps; gst_caps_replace (&sink_suggest, caps);
size_suggest = size; size_suggest = size;
suggest = FALSE; suggest = FALSE;
} }
@ -1709,9 +1709,12 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
"doing suggestion of size %u, caps %p %" GST_PTR_FORMAT, size_suggest, "doing suggestion of size %u, caps %p %" GST_PTR_FORMAT, size_suggest,
sink_suggest, sink_suggest); sink_suggest, sink_suggest);
GST_BUFFER_CAPS (*buf) = sink_suggest; GST_BUFFER_CAPS (*buf) = sink_suggest;
sink_suggest = NULL;
} }
gst_object_unref (trans); gst_object_unref (trans);
if (sink_suggest)
gst_caps_unref (sink_suggest);
return res; return res;
@ -1719,7 +1722,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
alloc_failed: alloc_failed:
{ {
GST_DEBUG_OBJECT (trans, "pad alloc failed: %s", gst_flow_get_name (res)); GST_DEBUG_OBJECT (trans, "pad alloc failed: %s", gst_flow_get_name (res));
if (suggest) if (sink_suggest)
gst_caps_unref (sink_suggest); gst_caps_unref (sink_suggest);
gst_object_unref (trans); gst_object_unref (trans);
return res; return res;
@ -1727,7 +1730,7 @@ alloc_failed:
not_supported: not_supported:
{ {
GST_DEBUG_OBJECT (trans, "pad alloc with unsupported caps"); GST_DEBUG_OBJECT (trans, "pad alloc with unsupported caps");
if (suggest) if (sink_suggest)
gst_caps_unref (sink_suggest); gst_caps_unref (sink_suggest);
gst_object_unref (trans); gst_object_unref (trans);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;