mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-25 11:11:08 +00:00
bufferlist: add gst_buffer_list_get_writable()
Ensures buffer is writable. Useful if we want to change metadata on it such as timestamps. https://bugzilla.gnome.org/show_bug.cgi?id=750241
This commit is contained in:
parent
9cd8fae44d
commit
177c4ffe6a
5 changed files with 71 additions and 0 deletions
|
@ -393,6 +393,7 @@ gst_buffer_list_make_writable
|
||||||
GstBufferListFunc
|
GstBufferListFunc
|
||||||
gst_buffer_list_foreach
|
gst_buffer_list_foreach
|
||||||
gst_buffer_list_get
|
gst_buffer_list_get
|
||||||
|
gst_buffer_list_get_writable
|
||||||
|
|
||||||
<SUBSECTION Standard>
|
<SUBSECTION Standard>
|
||||||
GST_BUFFER_LIST
|
GST_BUFFER_LIST
|
||||||
|
|
|
@ -273,6 +273,9 @@ gst_buffer_list_foreach (GstBufferList * list, GstBufferListFunc func,
|
||||||
*
|
*
|
||||||
* Get the buffer at @idx.
|
* Get the buffer at @idx.
|
||||||
*
|
*
|
||||||
|
* You must make sure that @idx does not exceed the number of
|
||||||
|
* buffers available.
|
||||||
|
*
|
||||||
* Returns: (transfer none) (nullable): the buffer at @idx in @group
|
* Returns: (transfer none) (nullable): the buffer at @idx in @group
|
||||||
* or %NULL when there is no buffer. The buffer remains valid as
|
* or %NULL when there is no buffer. The buffer remains valid as
|
||||||
* long as @list is valid and buffer is not removed from the list.
|
* long as @list is valid and buffer is not removed from the list.
|
||||||
|
@ -286,6 +289,35 @@ gst_buffer_list_get (GstBufferList * list, guint idx)
|
||||||
return list->buffers[idx];
|
return list->buffers[idx];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gst_buffer_list_get_writable:
|
||||||
|
* @list: a (writable) #GstBufferList
|
||||||
|
* @idx: the index
|
||||||
|
*
|
||||||
|
* Gets the buffer at @idx, ensuring it is a writable buffer.
|
||||||
|
*
|
||||||
|
* You must make sure that @idx does not exceed the number of
|
||||||
|
* buffers available.
|
||||||
|
*
|
||||||
|
* Returns: (transfer none) (nullable): the buffer at @idx in @group.
|
||||||
|
* The returned buffer remains valid as long as @list is valid and
|
||||||
|
* the buffer is not removed from the list.
|
||||||
|
*
|
||||||
|
* Since: 1.14
|
||||||
|
*/
|
||||||
|
GstBuffer *
|
||||||
|
gst_buffer_list_get_writable (GstBufferList * list, guint idx)
|
||||||
|
{
|
||||||
|
GstBuffer **p_buf;
|
||||||
|
|
||||||
|
g_return_val_if_fail (GST_IS_BUFFER_LIST (list), NULL);
|
||||||
|
g_return_val_if_fail (gst_buffer_list_is_writable (list), NULL);
|
||||||
|
g_return_val_if_fail (idx < list->n_buffers, NULL);
|
||||||
|
|
||||||
|
p_buf = &list->buffers[idx];
|
||||||
|
return (*p_buf = gst_buffer_make_writable (*p_buf));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gst_buffer_list_add:
|
* gst_buffer_list_add:
|
||||||
* @l: a #GstBufferList
|
* @l: a #GstBufferList
|
||||||
|
|
|
@ -148,6 +148,9 @@ guint gst_buffer_list_length (GstBufferList *l
|
||||||
GST_EXPORT
|
GST_EXPORT
|
||||||
GstBuffer * gst_buffer_list_get (GstBufferList *list, guint idx);
|
GstBuffer * gst_buffer_list_get (GstBufferList *list, guint idx);
|
||||||
|
|
||||||
|
GST_EXPORT
|
||||||
|
GstBuffer * gst_buffer_list_get_writable (GstBufferList *list, guint idx);
|
||||||
|
|
||||||
GST_EXPORT
|
GST_EXPORT
|
||||||
void gst_buffer_list_insert (GstBufferList *list, gint idx, GstBuffer *buffer);
|
void gst_buffer_list_insert (GstBufferList *list, gint idx, GstBuffer *buffer);
|
||||||
|
|
||||||
|
|
|
@ -427,6 +427,39 @@ GST_START_TEST (test_expand_and_remove)
|
||||||
|
|
||||||
GST_END_TEST;
|
GST_END_TEST;
|
||||||
|
|
||||||
|
GST_START_TEST (test_get_writable)
|
||||||
|
{
|
||||||
|
GstBuffer *buf, *writable_buf;
|
||||||
|
|
||||||
|
/* buffer list is initially empty */
|
||||||
|
fail_unless (gst_buffer_list_length (list) == 0);
|
||||||
|
|
||||||
|
/* Add 2 buffers */
|
||||||
|
buf = gst_buffer_new ();
|
||||||
|
ASSERT_BUFFER_REFCOUNT (buf, "buf", 1);
|
||||||
|
gst_buffer_list_add (list, buf);
|
||||||
|
ASSERT_BUFFER_REFCOUNT (buf, "buf", 1); /* list takes ownership */
|
||||||
|
fail_unless (gst_buffer_list_length (list) == 1);
|
||||||
|
fail_unless (buf == gst_buffer_list_get_writable (list, 0));
|
||||||
|
fail_unless (buf == gst_buffer_list_get (list, 0));
|
||||||
|
|
||||||
|
/* extra ref to make buffer no longer writable */
|
||||||
|
gst_buffer_ref (buf);
|
||||||
|
ASSERT_BUFFER_REFCOUNT (buf, "buf", 2);
|
||||||
|
fail_unless (buf == gst_buffer_list_get (list, 0));
|
||||||
|
ASSERT_BUFFER_REFCOUNT (buf, "buf", 2);
|
||||||
|
|
||||||
|
/* should make a copy to make it writable */
|
||||||
|
writable_buf = gst_buffer_list_get_writable (list, 0);
|
||||||
|
fail_if (buf == writable_buf);
|
||||||
|
ASSERT_BUFFER_REFCOUNT (buf, "buf", 1);
|
||||||
|
ASSERT_BUFFER_REFCOUNT (writable_buf, "writable_buf", 1);
|
||||||
|
|
||||||
|
gst_buffer_unref (buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
GST_END_TEST;
|
||||||
|
|
||||||
static Suite *
|
static Suite *
|
||||||
gst_buffer_list_suite (void)
|
gst_buffer_list_suite (void)
|
||||||
{
|
{
|
||||||
|
@ -442,6 +475,7 @@ gst_buffer_list_suite (void)
|
||||||
tcase_add_test (tc_chain, test_copy_deep);
|
tcase_add_test (tc_chain, test_copy_deep);
|
||||||
tcase_add_test (tc_chain, test_foreach);
|
tcase_add_test (tc_chain, test_foreach);
|
||||||
tcase_add_test (tc_chain, test_expand_and_remove);
|
tcase_add_test (tc_chain, test_expand_and_remove);
|
||||||
|
tcase_add_test (tc_chain, test_get_writable);
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
|
@ -150,6 +150,7 @@ EXPORTS
|
||||||
gst_buffer_list_foreach
|
gst_buffer_list_foreach
|
||||||
gst_buffer_list_get
|
gst_buffer_list_get
|
||||||
gst_buffer_list_get_type
|
gst_buffer_list_get_type
|
||||||
|
gst_buffer_list_get_writable
|
||||||
gst_buffer_list_insert
|
gst_buffer_list_insert
|
||||||
gst_buffer_list_length
|
gst_buffer_list_length
|
||||||
gst_buffer_list_new
|
gst_buffer_list_new
|
||||||
|
|
Loading…
Reference in a new issue