mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

adapter: refactor adapter take

Browse source 
Move some common code into one place
This commit is contained in:
Wim Taymans 2010-09-17 12:48:55 +02:00
parent 1dde3cb440
commit fc4caf55c9
1 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
libs/gst/base/gstadapter.c
View file

@ -540,6 +540,28 @@ gst_adapter_flush (GstAdapter * adapter, guint flush)
gst_adapter_flush_unchecked (adapter, flush); gst_adapter_flush_unchecked (adapter, flush);
} }
/* internal function, nbytes should be flushed after calling this function */
static guint8 *
gst_adapter_take_internal (GstAdapter * adapter, guint nbytes)
{
guint8 *data;
/* we have enough assembled data, take from there */
if (adapter->assembled_len >= nbytes) {
GST_LOG_OBJECT (adapter, "taking %u bytes already assembled", nbytes);
data = adapter->assembled_data;
/* allocate new data, assembled_len will be set to 0 in the flush later */
adapter->assembled_data = g_malloc (adapter->assembled_size);
} else {
/* we need to allocate and copy. We could potentially copy bytes from the
* assembled data before doing the copy_into */
GST_LOG_OBJECT (adapter, "taking %u bytes by collection", nbytes);
data = g_malloc (nbytes);
copy_into_unchecked (adapter, data, adapter->skip, nbytes);
}
return data;
}
/** /**
* gst_adapter_take: * gst_adapter_take:
* @adapter: a #GstAdapter * @adapter: a #GstAdapter
@ -566,19 +588,7 @@ gst_adapter_take (GstAdapter * adapter, guint nbytes)
if (G_UNLIKELY (nbytes > adapter->size)) if (G_UNLIKELY (nbytes > adapter->size))
return NULL; return NULL;
/* we have enough assembled data, take from there */ data = gst_adapter_take_internal (adapter, nbytes);
if (adapter->assembled_len >= nbytes) {
GST_LOG_OBJECT (adapter, "taking %u bytes already assembled", nbytes);
data = adapter->assembled_data;
/* allocate new data, assembled_len will be set to 0 in the flush below */
adapter->assembled_data = g_malloc (adapter->assembled_size);
} else {
/* we need to allocate and copy. We could potentially copy bytes from the
* assembled data before doing the copy_into */
GST_LOG_OBJECT (adapter, "taking %u bytes by collection", nbytes);
data = g_malloc (nbytes);
copy_into_unchecked (adapter, data, adapter->skip, nbytes);
}
gst_adapter_flush_unchecked (adapter, nbytes); gst_adapter_flush_unchecked (adapter, nbytes);
@ -609,6 +619,7 @@ gst_adapter_take_buffer (GstAdapter * adapter, guint nbytes)
GstBuffer *buffer; GstBuffer *buffer;
GstBuffer *cur; GstBuffer *cur;
guint hsize, skip; guint hsize, skip;
guint8 *data;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), NULL); g_return_val_if_fail (GST_IS_ADAPTER (adapter), NULL);
g_return_val_if_fail (nbytes > 0, NULL); g_return_val_if_fail (nbytes > 0, NULL);
@ -649,22 +660,12 @@ gst_adapter_take_buffer (GstAdapter * adapter, guint nbytes)
} }
} }
/* we have enough assembled data, copy from there */ data = gst_adapter_take_internal (adapter, nbytes);
if (adapter->assembled_len >= nbytes) {
GST_LOG_OBJECT (adapter, "taking %u bytes already assembled", nbytes); buffer = gst_buffer_new ();
buffer = gst_buffer_new (); GST_BUFFER_SIZE (buffer) = nbytes;
GST_BUFFER_SIZE (buffer) = nbytes; GST_BUFFER_DATA (buffer) = data;
GST_BUFFER_DATA (buffer) = adapter->assembled_data; GST_BUFFER_MALLOCDATA (buffer) = data;
GST_BUFFER_MALLOCDATA (buffer) = adapter->assembled_data;
/* flush will set the assembled_len to 0 */
adapter->assembled_data = g_malloc (adapter->assembled_size);
} else {
/* we need to allocate and copy. We could potentially copy bytes from the
* assembled data before doing the copy_into */
buffer = gst_buffer_new_and_alloc (nbytes);
GST_LOG_OBJECT (adapter, "taking %u bytes by collection", nbytes);
copy_into_unchecked (adapter, GST_BUFFER_DATA (buffer), skip, nbytes);
}
done: done:
gst_adapter_flush_unchecked (adapter, nbytes); gst_adapter_flush_unchecked (adapter, nbytes);