mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 14:36:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/gstbasetransform.c: Also unset the GAP flag on buffers if we're working inplace but the element is not ...

Browse source 
Original commit message from CVS:
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_prepare_output_buffer):
Also unset the GAP flag on buffers if we're working inplace but
the element is not GAP-aware.
Mark a comment as FIXME 0.11.
This commit is contained in:
Sebastian Dröge 2008-03-31 10:21:57 +00:00
parent e2f65711ee
commit cd62b1a3b4
2 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-03-31 Sebastian Dröge <slomo@circular-chaos.org>
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_prepare_output_buffer):
Also unset the GAP flag on buffers if we're working inplace but
the element is not GAP-aware.
Mark a comment as FIXME 0.11.
2008-03-31 Stefan Kost <ensonic@users.sf.net> 2008-03-31 Stefan Kost <ensonic@users.sf.net>
* gst/gst.c: * gst/gst.c:

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

@ -913,7 +913,8 @@ gst_base_transform_prepare_output_buffer (GstBaseTransform * trans,
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto done; goto done;
/* decrease refcount again if vmethod returned refcounted in_buf. This /* FIXME 0.11:
* decrease refcount again if vmethod returned refcounted in_buf. This
* is because we need to make sure that the buffer is writable for the * is because we need to make sure that the buffer is writable for the
* in_place transform. The docs of the vmethod say that you should return * in_place transform. The docs of the vmethod say that you should return
* a reffed inbuf, which is exactly what we don't want :), oh well.. */ * a reffed inbuf, which is exactly what we don't want :), oh well.. */
@ -925,17 +926,27 @@ gst_base_transform_prepare_output_buffer (GstBaseTransform * trans,
if (*out_buf == NULL && GST_BUFFER_SIZE (in_buf) == out_size if (*out_buf == NULL && GST_BUFFER_SIZE (in_buf) == out_size
&& bclass->transform_ip) { && bclass->transform_ip) {
if (gst_buffer_is_writable (in_buf)) { if (gst_buffer_is_writable (in_buf)) {
if (trans->have_same_caps) { if (trans->have_same_caps &&
/* Input buffer is already writable and caps are the same, return input as (trans->priv->gap_aware
* output buffer. We don't take an additional ref since that would make the || !GST_BUFFER_FLAG_IS_SET (in_buf, GST_BUFFER_FLAG_GAP))) {
* output buffer not writable anymore. Caller should be prepared to deal /* Input buffer is already writable, caps are the same and it's not necessary
* with proper refcounting of input/output buffers. */ * to change the GAP flag, return input as output buffer.
* We don't take an additional ref since that would make the output buffer
* not writable anymore. Caller should be prepared to deal with proper
* refcounting of input/output buffers. */
*out_buf = in_buf; *out_buf = in_buf;
GST_LOG_OBJECT (trans, "reuse input buffer"); GST_LOG_OBJECT (trans, "reuse input buffer");
} else { } else {
/* Writable buffer, but need to change caps => subbuffer */ /* Writable buffer, but need to change caps or flags => subbuffer */
*out_buf = gst_buffer_create_sub (in_buf, 0, GST_BUFFER_SIZE (in_buf)); *out_buf = gst_buffer_create_sub (in_buf, 0, GST_BUFFER_SIZE (in_buf));
gst_caps_replace (&GST_BUFFER_CAPS (*out_buf), out_caps); gst_caps_replace (&GST_BUFFER_CAPS (*out_buf), out_caps);
/* Unset the GAP flag if the element is _not_ GAP aware. Otherwise
* it might create an output buffer that does not contain neutral data
* but still has the GAP flag on it! */
if (!trans->priv->gap_aware)
GST_BUFFER_FLAG_UNSET (*out_buf, GST_BUFFER_FLAG_GAP);
GST_LOG_OBJECT (trans, "created sub-buffer of input buffer"); GST_LOG_OBJECT (trans, "created sub-buffer of input buffer");
} }
/* we are done now */ /* we are done now */