mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gst: copy buffer memory in dequeue_buffer using gst_memory_copy

Browse source 
When always-copy is enabled we should copy buffer memory instead of
sharing buffer memory and using gst_buffer_copy_deep.

This should ensure we recycle the parent buffer as soon as the memory
is copied.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
This commit is contained in:
James Hilliard 2022-08-20 00:19:42 -06:00
parent a969feb3c0
commit 1ea1d525c1
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/gst/gstpipewiresrc.c
View file

@ -568,19 +568,23 @@ static GstBuffer *dequeue_buffer(GstPipeWireSrc *pwsrc)
meta->height = crop->region.size.height; meta->height = crop->region.size.height;
} }
} }
gst_buffer_add_parent_buffer_meta (buf, data->buf);
gst_buffer_unref (data->buf);
for (i = 0; i < b->buffer->n_datas; i++) { for (i = 0; i < b->buffer->n_datas; i++) {
struct spa_data *d = &b->buffer->datas[i]; struct spa_data *d = &b->buffer->datas[i];
GstMemory *pmem = gst_buffer_peek_memory (data->buf, i); GstMemory *pmem = gst_buffer_peek_memory (data->buf, i);
if (pmem) { if (pmem) {
GstMemory *mem = gst_memory_share (pmem, d->chunk->offset, d->chunk->size); GstMemory *mem;
if (!pwsrc->always_copy)
mem = gst_memory_share (pmem, d->chunk->offset, d->chunk->size);
else
mem = gst_memory_copy (pmem, d->chunk->offset, d->chunk->size);
gst_buffer_insert_memory (buf, i, mem); gst_buffer_insert_memory (buf, i, mem);
spa_assert_se(mem->size <= mem->maxsize);
} }
if (d->chunk->flags & SPA_CHUNK_FLAG_CORRUPTED) if (d->chunk->flags & SPA_CHUNK_FLAG_CORRUPTED)
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_CORRUPTED); GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_CORRUPTED);
} }
if (!pwsrc->always_copy)
gst_buffer_add_parent_buffer_meta (buf, data->buf);
gst_buffer_unref (data->buf);
return buf; return buf;
} }
@ -1091,11 +1095,6 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
} }
pw_thread_loop_unlock (pwsrc->core->loop); pw_thread_loop_unlock (pwsrc->core->loop);
if (pwsrc->always_copy) {
*buffer = gst_buffer_copy_deep (buf);
gst_buffer_unref (buf);
}
else
*buffer = buf; *buffer = buf;
if (pwsrc->is_live) if (pwsrc->is_live)