GstAdapter: Discard empty buffers in _push(). Fixes #574024

This commit is contained in:
Edward Hervey 2009-03-04 09:20:43 +01:00
parent 2323d50faa
commit f0481cb717

View file

@ -193,6 +193,8 @@ gst_adapter_clear (GstAdapter * adapter)
*
* Adds the data from @buf to the data stored inside @adapter and takes
* ownership of the buffer.
* Empty buffers will be automatically dereferenced and not stored in the
* @adapter.
*/
void
gst_adapter_push (GstAdapter * adapter, GstBuffer * buf)
@ -204,6 +206,11 @@ gst_adapter_push (GstAdapter * adapter, GstBuffer * buf)
size = GST_BUFFER_SIZE (buf);
if (G_UNLIKELY (size == 0)) {
GST_LOG_OBJECT (adapter, "discarding empty buffer");
gst_buffer_unref (buf);
} else {
adapter->size += size;
/* Note: merging buffers at this point is premature. */
@ -217,6 +224,7 @@ gst_adapter_push (GstAdapter * adapter, GstBuffer * buf)
adapter->buflist_end = g_slist_append (adapter->buflist_end, buf);
adapter->buflist_end = g_slist_next (adapter->buflist_end);
}
}
}
/* Internal function that copies data into the given buffer, size must be