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

pipewiresrc: use the right allocator for dmabuf

Browse source 
Use the dmabuf allocator when we get dmabuf memory.
https://github.com/PipeWire/pipewire/issues/31
This commit is contained in:
Wim Taymans 2018-02-08 12:24:23 +01:00
parent 21e3b4cec7
commit d841e0f778
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/gst/gstpipewiresrc.c
View file

@ -42,6 +42,7 @@
#include <gst/net/gstnetclientclock.h> #include <gst/net/gstnetclientclock.h>
#include <gst/allocators/gstfdmemory.h> #include <gst/allocators/gstfdmemory.h>
#include <gst/allocators/gstdmabuf.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include "gstpipewireclock.h" #include "gstpipewireclock.h"
@ -211,6 +212,7 @@ gst_pipewire_src_finalize (GObject * object)
if (pwsrc->properties) if (pwsrc->properties)
gst_structure_free (pwsrc->properties); gst_structure_free (pwsrc->properties);
g_object_unref (pwsrc->fd_allocator); g_object_unref (pwsrc->fd_allocator);
g_object_unref (pwsrc->dmabuf_allocator);
if (pwsrc->clock) if (pwsrc->clock)
gst_object_unref (pwsrc->clock); gst_object_unref (pwsrc->clock);
g_free (pwsrc->path); g_free (pwsrc->path);
@ -321,6 +323,7 @@ gst_pipewire_src_init (GstPipeWireSrc * src)
g_queue_init (&src->queue); g_queue_init (&src->queue);
src->fd_allocator = gst_fd_allocator_new (); src->fd_allocator = gst_fd_allocator_new ();
src->dmabuf_allocator = gst_dmabuf_allocator_new ();
src->client_name = pw_get_client_name (); src->client_name = pw_get_client_name ();
src->buf_ids = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) gst_buffer_unref); src->buf_ids = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) gst_buffer_unref);
@ -400,12 +403,18 @@ on_add_buffer (void *_data, guint id)
struct spa_data *d = &b->datas[i]; struct spa_data *d = &b->datas[i];
GstMemory *gmem = NULL; GstMemory *gmem = NULL;
if (d->type == t->data.MemFd || d->type == t->data.DmaBuf) { if (d->type == t->data.MemFd) {
gmem = gst_fd_allocator_alloc (pwsrc->fd_allocator, dup (d->fd), gmem = gst_fd_allocator_alloc (pwsrc->fd_allocator, dup (d->fd),
d->mapoffset + d->maxsize, GST_FD_MEMORY_FLAG_NONE); d->mapoffset + d->maxsize, GST_FD_MEMORY_FLAG_NONE);
gst_memory_resize (gmem, d->mapoffset, d->maxsize); gst_memory_resize (gmem, d->mapoffset, d->maxsize);
data.offset = d->mapoffset; data.offset = d->mapoffset;
} }
else if(d->type == t->data.DmaBuf) {
gmem = gst_dmabuf_allocator_alloc (pwsrc->dmabuf_allocator, dup (d->fd),
d->mapoffset + d->maxsize);
gst_memory_resize (gmem, d->mapoffset, d->maxsize);
data.offset = d->mapoffset;
}
else if (d->type == t->data.MemPtr) { else if (d->type == t->data.MemPtr) {
gmem = gst_memory_new_wrapped (0, d->data, d->maxsize, 0, gmem = gst_memory_new_wrapped (0, d->data, d->maxsize, 0,
d->maxsize, NULL, NULL); d->maxsize, NULL, NULL);

1
src/gst/gstpipewiresrc.h
View file

@ -77,6 +77,7 @@ struct _GstPipeWireSrc {
struct spa_hook stream_listener; struct spa_hook stream_listener;
GstAllocator *fd_allocator; GstAllocator *fd_allocator;
GstAllocator *dmabuf_allocator;
GstStructure *properties; GstStructure *properties;
GHashTable *buf_ids; GHashTable *buf_ids;