mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 01:32:42 +00:00
gst/gstpad.c: Remove silly redundant debug.
Original commit message from CVS: * gst/gstpad.c: (gst_pad_acceptcaps_default), (gst_pad_configure_src), (gst_pad_alloc_buffer_full): Remove silly redundant debug. Add some more debug info. Clarify the docs regarding new caps received from pad_alloc.
This commit is contained in:
parent
f688febd0f
commit
48336614c0
2 changed files with 20 additions and 7 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2008-07-31 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||||
|
|
||||||
|
* gst/gstpad.c: (gst_pad_acceptcaps_default),
|
||||||
|
(gst_pad_configure_src), (gst_pad_alloc_buffer_full):
|
||||||
|
Remove silly redundant debug.
|
||||||
|
Add some more debug info.
|
||||||
|
Clarify the docs regarding new caps received from pad_alloc.
|
||||||
|
|
||||||
2008-07-31 Wim Taymans <wim.taymans@collabora.co.uk>
|
2008-07-31 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||||
|
|
||||||
* plugins/elements/gstcapsfilter.c: (gst_capsfilter_set_property),
|
* plugins/elements/gstcapsfilter.c: (gst_capsfilter_set_property),
|
||||||
|
|
19
gst/gstpad.c
19
gst/gstpad.c
|
@ -2233,8 +2233,6 @@ gst_pad_acceptcaps_default (GstPad * pad, GstCaps * caps)
|
||||||
GST_DEBUG_OBJECT (pad, "intersection %" GST_PTR_FORMAT, intersect);
|
GST_DEBUG_OBJECT (pad, "intersection %" GST_PTR_FORMAT, intersect);
|
||||||
|
|
||||||
result = !gst_caps_is_empty (intersect);
|
result = !gst_caps_is_empty (intersect);
|
||||||
if (!result)
|
|
||||||
GST_DEBUG_OBJECT (pad, "intersection gave empty caps");
|
|
||||||
|
|
||||||
gst_caps_unref (allowed);
|
gst_caps_unref (allowed);
|
||||||
gst_caps_unref (intersect);
|
gst_caps_unref (intersect);
|
||||||
|
@ -2463,11 +2461,11 @@ gst_pad_configure_src (GstPad * pad, GstCaps * caps, gboolean dosetcaps)
|
||||||
if (!gst_pad_accept_caps (pad, caps))
|
if (!gst_pad_accept_caps (pad, caps))
|
||||||
goto not_accepted;
|
goto not_accepted;
|
||||||
|
|
||||||
if (dosetcaps)
|
if (dosetcaps) {
|
||||||
res = gst_pad_set_caps (pad, caps);
|
res = gst_pad_set_caps (pad, caps);
|
||||||
else
|
} else {
|
||||||
res = TRUE;
|
res = TRUE;
|
||||||
|
}
|
||||||
return res;
|
return res;
|
||||||
|
|
||||||
not_accepted:
|
not_accepted:
|
||||||
|
@ -2733,7 +2731,8 @@ gst_pad_alloc_buffer_full (GstPad * pad, guint64 offset, gint size,
|
||||||
g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
|
g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
|
||||||
g_return_val_if_fail (size >= 0, GST_FLOW_ERROR);
|
g_return_val_if_fail (size >= 0, GST_FLOW_ERROR);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (pad, "offset %" G_GUINT64_FORMAT ", size %d", offset, size);
|
GST_DEBUG_OBJECT (pad, "offset %" G_GUINT64_FORMAT ", size %d, caps %"
|
||||||
|
GST_PTR_FORMAT, offset, size, caps);
|
||||||
|
|
||||||
GST_OBJECT_LOCK (pad);
|
GST_OBJECT_LOCK (pad);
|
||||||
while (G_UNLIKELY (GST_PAD_IS_BLOCKED (pad)))
|
while (G_UNLIKELY (GST_PAD_IS_BLOCKED (pad)))
|
||||||
|
@ -2839,7 +2838,9 @@ wrong_size_fallback:
|
||||||
*
|
*
|
||||||
* A new, empty #GstBuffer will be put in the @buf argument.
|
* A new, empty #GstBuffer will be put in the @buf argument.
|
||||||
* You need to check the caps of the buffer after performing this
|
* You need to check the caps of the buffer after performing this
|
||||||
* function and renegotiate to the format if needed.
|
* function and renegotiate to the format if needed. If the caps changed, it is
|
||||||
|
* possible that the buffer returned in @buf is not of the right size for the
|
||||||
|
* new format, @buf needs to be unreffed and reallocated if this is the case.
|
||||||
*
|
*
|
||||||
* Returns: a result code indicating success of the operation. Any
|
* Returns: a result code indicating success of the operation. Any
|
||||||
* result code other than #GST_FLOW_OK is an error and @buf should
|
* result code other than #GST_FLOW_OK is an error and @buf should
|
||||||
|
@ -2870,6 +2871,10 @@ gst_pad_alloc_buffer (GstPad * pad, guint64 offset, gint size, GstCaps * caps,
|
||||||
* automatically calls gst_pad_set_caps() when the caps of the
|
* automatically calls gst_pad_set_caps() when the caps of the
|
||||||
* newly allocated buffer are different from the @pad caps.
|
* newly allocated buffer are different from the @pad caps.
|
||||||
*
|
*
|
||||||
|
* After a renegotiation, the size of the new buffer returned in @buf could
|
||||||
|
* be of the wrong size for the new format and must be unreffed an reallocated
|
||||||
|
* in that case.
|
||||||
|
*
|
||||||
* Returns: a result code indicating success of the operation. Any
|
* Returns: a result code indicating success of the operation. Any
|
||||||
* result code other than #GST_FLOW_OK is an error and @buf should
|
* result code other than #GST_FLOW_OK is an error and @buf should
|
||||||
* not be used.
|
* not be used.
|
||||||
|
|
Loading…
Reference in a new issue