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

jack: fix refcount of memory

Browse source
This commit is contained in:
Wim Taymans 2018-07-07 10:47:49 +02:00
parent 3b8b67bc99
commit 4f054f9551
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pipewire-jack.c
View file

@ -534,6 +534,17 @@ static struct mem *find_mem(struct pw_array *mems, uint32_t id)
return NULL; return NULL;
} }
static struct mem *find_mem_ptr(struct pw_array *mems, void *ptr)
{
struct mem *m;
pw_array_for_each(m, mems) {
if (m->ptr == ptr)
return m;
}
return NULL;
}
static void *mem_map(struct client *c, struct mem *m, uint32_t offset, uint32_t size) static void *mem_map(struct client *c, struct mem *m, uint32_t offset, uint32_t size)
{ {
struct pw_map_range map; struct pw_map_range map;
@ -1220,8 +1231,14 @@ static void client_node_set_position(void *object,
if ((ptr = mem_map(c, m, offset, size)) == NULL) { if ((ptr = mem_map(c, m, offset, size)) == NULL) {
return; return;
} }
m->ref++;
} }
pw_log_debug("client %p: set position %p", c, ptr); pw_log_debug("client %p: set position %p", c, ptr);
if (ptr == NULL && c->position) {
m = find_mem_ptr(&c->mems, c->position);
if (m && --m->ref == 0)
clear_mem(c, m);
}
c->position = ptr; c->position = ptr;
c->quantum = SPA_MEMBER(ptr, sizeof(struct pw_client_node_position), void); c->quantum = SPA_MEMBER(ptr, sizeof(struct pw_client_node_position), void);
} }