mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-25 07:26:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

adapter: remove flush from _unmap

Browse source
This commit is contained in:
Wim Taymans 2011-11-10 18:18:24 +01:00
parent 54a9c5d3f8
commit 4b216bf73a
5 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,8 @@
* const guint8 *data = gst_adapter_map (adapter, 512); * const guint8 *data = gst_adapter_map (adapter, 512);
* // use flowreturn as an error value * // use flowreturn as an error value
* ret = my_library_foo (data); * ret = my_library_foo (data);
* gst_adapter_unmap (adapter, 512); * gst_adapter_unmap (adapter);
* gst_adapter_flush (adapter, 512);
* } * }
* *
* gst_object_unref (this); * gst_object_unref (this);
@ -478,13 +479,11 @@ gst_adapter_map (GstAdapter * adapter, gsize size)
/** /**
* gst_adapter_unmap: * gst_adapter_unmap:
* @adapter: a #GstAdapter * @adapter: a #GstAdapter
* @flush: the amount of bytes to flush
* *
* Releases the memory obtained with the last gst_adapter_map() and flushes * Releases the memory obtained with the last gst_adapter_map().
* @size bytes from the adapter.
*/ */
void void
gst_adapter_unmap (GstAdapter * adapter, gsize flush) gst_adapter_unmap (GstAdapter * adapter)
{ {
g_return_if_fail (GST_IS_ADAPTER (adapter)); g_return_if_fail (GST_IS_ADAPTER (adapter));
@ -493,9 +492,6 @@ gst_adapter_unmap (GstAdapter * adapter, gsize flush)
gst_buffer_unmap (cur, adapter->priv->cdata, adapter->priv->csize); gst_buffer_unmap (cur, adapter->priv->cdata, adapter->priv->csize);
adapter->priv->cdata = NULL; adapter->priv->cdata = NULL;
} }
if (flush)
gst_adapter_flush_unchecked (adapter, flush);
} }
/** /**

2
libs/gst/base/gstadapter.h
View file

@ -80,7 +80,7 @@ GstAdapter * gst_adapter_new (void);
void gst_adapter_clear (GstAdapter *adapter); void gst_adapter_clear (GstAdapter *adapter);
void gst_adapter_push (GstAdapter *adapter, GstBuffer* buf); void gst_adapter_push (GstAdapter *adapter, GstBuffer* buf);
const gpointer gst_adapter_map (GstAdapter *adapter, gsize size); const gpointer gst_adapter_map (GstAdapter *adapter, gsize size);
void gst_adapter_unmap (GstAdapter *adapter, gsize flush); void gst_adapter_unmap (GstAdapter *adapter);
void gst_adapter_copy (GstAdapter *adapter, gpointer dest, void gst_adapter_copy (GstAdapter *adapter, gpointer dest,
gsize offset, gsize size); gsize offset, gsize size);
void gst_adapter_flush (GstAdapter *adapter, gsize flush); void gst_adapter_flush (GstAdapter *adapter, gsize flush);

2
libs/gst/base/gstbaseparse.c
View file

@ -2383,7 +2383,7 @@ gst_base_parse_chain (GstPad * pad, GstBuffer * buffer)
skip = -1; skip = -1;
gst_base_parse_frame_update (parse, frame, tmpbuf); gst_base_parse_frame_update (parse, frame, tmpbuf);
res = bclass->check_valid_frame (parse, frame, &fsize, &skip); res = bclass->check_valid_frame (parse, frame, &fsize, &skip);
gst_adapter_unmap (parse->priv->adapter, 0); gst_adapter_unmap (parse->priv->adapter);
gst_buffer_replace (&frame->buffer, NULL); gst_buffer_replace (&frame->buffer, NULL);
gst_buffer_remove_memory_range (tmpbuf, 0, -1); gst_buffer_remove_memory_range (tmpbuf, 0, -1);
if (res) { if (res) {

2
plugins/elements/gsttypefindelement.c
View file

@ -795,7 +795,7 @@ gst_type_find_element_chain_do_typefinding (GstTypeFindElement * typefind,
data = gst_adapter_map (typefind->adapter, avail); data = gst_adapter_map (typefind->adapter, avail);
caps = gst_type_find_helper_for_data (GST_OBJECT (typefind), caps = gst_type_find_helper_for_data (GST_OBJECT (typefind),
data, avail, &probability); data, avail, &probability);
gst_adapter_unmap (typefind->adapter, 0); gst_adapter_unmap (typefind->adapter);
if (caps == NULL && have_max) if (caps == NULL && have_max)
goto no_type_found; goto no_type_found;

10
tests/check/libs/adapter.c
View file

@ -69,13 +69,13 @@ GST_START_TEST (test_peek1)
fail_if (data1 == NULL); fail_if (data1 == NULL);
/* it should point to the buffer data as well */ /* it should point to the buffer data as well */
fail_if (data1 != bufdata); fail_if (data1 != bufdata);
gst_adapter_unmap (adapter, 0); gst_adapter_unmap (adapter);
data2 = gst_adapter_map (adapter, 512); data2 = gst_adapter_map (adapter, 512);
fail_if (data2 == NULL); fail_if (data2 == NULL);
/* second peek should return the same pointer */ /* second peek should return the same pointer */
fail_if (data2 != data1); fail_if (data2 != data1);
gst_adapter_unmap (adapter, 0); gst_adapter_unmap (adapter);
/* this should fail since we don't have that many bytes */ /* this should fail since we don't have that many bytes */
ASSERT_CRITICAL (gst_adapter_flush (adapter, 513)); ASSERT_CRITICAL (gst_adapter_flush (adapter, 513));
@ -99,7 +99,7 @@ GST_START_TEST (test_peek1)
/* peek should return the same old pointer + 10 */ /* peek should return the same old pointer + 10 */
fail_if (data2 != data1 + 10); fail_if (data2 != data1 + 10);
fail_if (data2 != bufdata + 10); fail_if (data2 != bufdata + 10);
gst_adapter_unmap (adapter, 0); gst_adapter_unmap (adapter);
/* flush some more */ /* flush some more */
gst_adapter_flush (adapter, 500); gst_adapter_flush (adapter, 500);
@ -114,7 +114,7 @@ GST_START_TEST (test_peek1)
fail_if (data2 == NULL); fail_if (data2 == NULL);
fail_if (data2 != data1 + 510); fail_if (data2 != data1 + 510);
fail_if (data2 != bufdata + 510); fail_if (data2 != bufdata + 510);
gst_adapter_unmap (adapter, 0); gst_adapter_unmap (adapter);
/* flush some more */ /* flush some more */
gst_adapter_flush (adapter, 2); gst_adapter_flush (adapter, 2);
@ -541,7 +541,7 @@ GST_START_TEST (test_timestamp)
/* remove empty buffer, timestamp still visible */ /* remove empty buffer, timestamp still visible */
cdata = gst_adapter_map (adapter, 50); cdata = gst_adapter_map (adapter, 50);
fail_unless (cdata != NULL); fail_unless (cdata != NULL);
gst_adapter_unmap (adapter, 0); gst_adapter_unmap (adapter);
data = gst_adapter_take (adapter, 50); data = gst_adapter_take (adapter, 50);
fail_unless (data != NULL); fail_unless (data != NULL);