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

remote-node: fix mmap offset

Browse source 
Use the right offset in the mapped memory
Clear the DYNAMIC data flag because we really can only work with
the shared memory.
This commit is contained in:
Wim Taymans 2019-07-15 17:14:34 +02:00
parent b0b379fc2a
commit 0a6ee19018
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/module-client-node/remote-node.c
View file

@ -165,7 +165,7 @@ static void *mem_map(struct node_data *data, struct mapping *map,
map->ptr = m.ptr; map->ptr = m.ptr;
pw_log_debug("remote %p: fd %d map %d %d %p", data, fd, m.map.offset, m.map.size, m.ptr); pw_log_debug("remote %p: fd %d map %d %d %p", data, fd, m.map.offset, m.map.size, m.ptr);
} }
ptr = SPA_MEMBER(map->ptr, map->map.start, void); ptr = SPA_MEMBER(map->ptr, m.map.start, void);
pw_log_debug("remote %p: fd %d ptr %p (%d %d)", data, fd, ptr, offset, size); pw_log_debug("remote %p: fd %d ptr %p (%d %d)", data, fd, ptr, offset, size);
return ptr; return ptr;
@ -479,7 +479,8 @@ static int add_port_update(struct pw_proxy *proxy, struct pw_port *port, uint32_
pi.flags = port->spa_flags; pi.flags = port->spa_flags;
pi.rate = SPA_FRACTION(0, 1); pi.rate = SPA_FRACTION(0, 1);
pi.props = &port->properties->dict; pi.props = &port->properties->dict;
pi.flags &= ~SPA_PORT_FLAG_CAN_ALLOC_BUFFERS; SPA_FLAG_UNSET(pi.flags,
SPA_PORT_FLAG_CAN_ALLOC_BUFFERS | SPA_PORT_FLAG_DYNAMIC_DATA);
pi.n_params = port->info.n_params; pi.n_params = port->info.n_params;
pi.params = port->info.params; pi.params = port->info.params;
} }