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

jack: fix stride of midi

Browse source 
Midi has a stride of 1
Error when the number of buffers is too big
This commit is contained in:
Wim Taymans 2020-02-18 18:03:30 +01:00
parent 1f3cb3d207
commit b3d94cde87
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pipewire-jack/src/pipewire-jack.c
View file

@ -1375,7 +1375,7 @@ static int param_buffers(struct client *c, struct port *p,
sizeof(float), sizeof(float),
MAX_BUFFER_FRAMES * sizeof(float), MAX_BUFFER_FRAMES * sizeof(float),
sizeof(float)), sizeof(float)),
SPA_PARAM_BUFFERS_stride, SPA_POD_Int(4), SPA_PARAM_BUFFERS_stride, SPA_POD_Int(p->object->port.type_id == 0 ? sizeof(float) : 1),
SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); SPA_PARAM_BUFFERS_align, SPA_POD_Int(16));
break; break;
case 2: case 2:
@ -1531,8 +1531,10 @@ static int client_node_port_use_buffers(void *object,
pw_log_debug(NAME" %p: port %p %d %d.%d use_buffers %d", c, p, direction, pw_log_debug(NAME" %p: port %p %d %d.%d use_buffers %d", c, p, direction,
port_id, mix_id, n_buffers); port_id, mix_id, n_buffers);
if (n_buffers > MAX_BUFFERS) if (n_buffers > MAX_BUFFERS) {
pw_log_error(NAME" %p: too many buffers %u > %u", c, n_buffers, MAX_BUFFERS);
return -EINVAL; return -EINVAL;
}
if (p->object->port.type_id == 2 && direction == SPA_DIRECTION_INPUT) { if (p->object->port.type_id == 2 && direction == SPA_DIRECTION_INPUT) {
fl = PW_MEMMAP_FLAG_READ; fl = PW_MEMMAP_FLAG_READ;