mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

gst: dequeue a shared buffer instead of original pool buffer

Browse source 
This seems to prevent the pool buffer from getting corrupted.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
This commit is contained in:
James Hilliard 2022-06-01 04:03:37 -06:00
parent 7305d38b85
commit a1f33a99df
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/gst/gstpipewirepool.c
View file

@ -92,21 +92,18 @@ void gst_pipewire_pool_wrap_buffer (GstPipeWirePool *pool, struct pw_buffer *b)
gmem = gst_fd_allocator_alloc (pool->fd_allocator, d->fd, gmem = gst_fd_allocator_alloc (pool->fd_allocator, d->fd,
d->mapoffset + d->maxsize, GST_FD_MEMORY_FLAG_DONT_CLOSE); d->mapoffset + d->maxsize, GST_FD_MEMORY_FLAG_DONT_CLOSE);
gst_memory_resize (gmem, d->mapoffset, d->maxsize); gst_memory_resize (gmem, d->mapoffset, d->maxsize);
data->offset = d->mapoffset;
} }
else if(d->type == SPA_DATA_DmaBuf) { else if(d->type == SPA_DATA_DmaBuf) {
gmem = gst_fd_allocator_alloc (pool->dmabuf_allocator, d->fd, gmem = gst_fd_allocator_alloc (pool->dmabuf_allocator, d->fd,
d->mapoffset + d->maxsize, GST_FD_MEMORY_FLAG_DONT_CLOSE); d->mapoffset + d->maxsize, GST_FD_MEMORY_FLAG_DONT_CLOSE);
gst_memory_resize (gmem, d->mapoffset, d->maxsize); gst_memory_resize (gmem, d->mapoffset, d->maxsize);
data->offset = d->mapoffset;
} }
else if (d->type == SPA_DATA_MemPtr) { else if (d->type == SPA_DATA_MemPtr) {
gmem = gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE, d->data, d->maxsize, 0, gmem = gst_memory_new_wrapped (0, d->data, d->maxsize, 0,
d->maxsize, NULL, NULL); d->maxsize, NULL, NULL);
data->offset = 0;
} }
if (gmem) if (gmem)
gst_buffer_append_memory (buf, gmem); gst_buffer_insert_memory (buf, i, gmem);
} }
data->pool = gst_object_ref (pool); data->pool = gst_object_ref (pool);

1
src/gst/gstpipewirepool.h
View file

@ -53,7 +53,6 @@ struct _GstPipeWirePoolData {
void *owner; void *owner;
struct spa_meta_header *header; struct spa_meta_header *header;
guint flags; guint flags;
goffset offset;
struct pw_buffer *b; struct pw_buffer *b;
GstBuffer *buf; GstBuffer *buf;
gboolean queued; gboolean queued;

2
src/gst/gstpipewiresink.c
View file

@ -466,7 +466,7 @@ do_send_buffer (GstPipeWireSink *pwsink, GstBuffer *buffer)
for (i = 0; i < b->n_datas; i++) { for (i = 0; i < b->n_datas; i++) {
struct spa_data *d = &b->datas[i]; struct spa_data *d = &b->datas[i];
GstMemory *mem = gst_buffer_peek_memory (buffer, i); GstMemory *mem = gst_buffer_peek_memory (buffer, i);
d->chunk->offset = mem->offset - data->offset; d->chunk->offset = mem->offset;
d->chunk->size = mem->size; d->chunk->size = mem->size;
} }

22
src/gst/gstpipewiresrc.c
View file

@ -497,14 +497,13 @@ static GstBuffer *dequeue_buffer(GstPipeWireSrc *pwsrc)
return NULL; return NULL;
data = b->user_data; data = b->user_data;
buf = data->buf;
GST_LOG_OBJECT (pwsrc, "got new buffer %p", buf); GST_LOG_OBJECT (pwsrc, "got new buffer %p", data->buf);
if (!data->queued) { buf = gst_buffer_new ();
GST_WARNING_OBJECT (pwsrc, "buffer %p was not recycled", buf);
gst_buffer_ref (buf); if (!data->queued)
} GST_WARNING_OBJECT (pwsrc, "buffer %p was not recycled", data->buf);
data->queued = FALSE; data->queued = FALSE;
GST_BUFFER_PTS (buf) = GST_CLOCK_TIME_NONE; GST_BUFFER_PTS (buf) = GST_CLOCK_TIME_NONE;
GST_BUFFER_DTS (buf) = GST_CLOCK_TIME_NONE; GST_BUFFER_DTS (buf) = GST_CLOCK_TIME_NONE;
@ -530,13 +529,16 @@ 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 *mem = gst_buffer_peek_memory (buf, i); GstMemory *pmem = gst_buffer_peek_memory (data->buf, i);
mem->offset = SPA_MIN(d->chunk->offset, d->maxsize); if (pmem) {
mem->size = SPA_MIN(d->chunk->size, d->maxsize - mem->offset); GstMemory *mem = gst_memory_share (pmem, d->chunk->offset, d->chunk->size);
mem->offset += data->offset; gst_buffer_insert_memory (buf, i, mem);
spa_assert_se(mem->size <= mem->maxsize); 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);
} }