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

remote: buffer id is now just the index of the buffer

Browse source 
Buffer id is only used internally as the index of the buffer
that was given to us by use_buffer or alloc_buffer
This commit is contained in:
Wim Taymans 2019-01-10 10:20:26 +01:00
parent 62672f4d23
commit 2f6c85cda1
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pipewire/remote.c
View file

@ -988,7 +988,7 @@ client_node_port_use_buffers(void *object,
struct pw_proxy *proxy = object; struct pw_proxy *proxy = object;
struct node_data *data = proxy->user_data; struct node_data *data = proxy->user_data;
struct buffer *bid; struct buffer *bid;
uint32_t i, j, len; uint32_t i, j;
struct spa_buffer *b, **bufs; struct spa_buffer *b, **bufs;
struct mix *mix; struct mix *mix;
int res, prot; int res, prot;
@ -1019,8 +1019,8 @@ client_node_port_use_buffers(void *object,
goto cleanup; goto cleanup;
} }
len = pw_array_get_len(&mix->buffers, struct buffer);
bid = pw_array_add(&mix->buffers, sizeof(struct buffer)); bid = pw_array_add(&mix->buffers, sizeof(struct buffer));
bid->id = i;
bmem.mem_id = m->id; bmem.mem_id = m->id;
bmem.map.ptr = mem_map(data, &bmem.map, m->fd, prot, bmem.map.ptr = mem_map(data, &bmem.map, m->fd, prot,
@ -1059,9 +1059,6 @@ client_node_port_use_buffers(void *object,
bid->mem[bid->n_mem++] = bmem; bid->mem[bid->n_mem++] = bmem;
m->ref++; m->ref++;
if (bid->id != len) {
pw_log_warn("unexpected id %u found, expected %u", bid->id, len);
}
pw_log_debug("add buffer %d %d %u %u", m->id, pw_log_debug("add buffer %d %d %u %u", m->id,
bid->id, bmem.map.map.offset, bmem.map.map.size); bid->id, bmem.map.map.offset, bmem.map.map.size);