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: always initialize the port buffer

Browse source 
Init the port buffer after we create it, not only after we get a buffer
on the port.
Cleanup a little.
This commit is contained in:
Wim Taymans 2020-04-28 14:15:49 +02:00
parent 856e1fe812
commit 83b30dcd3d
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1544,20 +1544,26 @@ static int client_node_port_set_param(void *object,
NULL); NULL);
} }
static void init_buffer(struct port *p, void *data, size_t maxframes) static void *init_buffer(struct port *p)
{ {
void *data = p->emptyptr;
if (p->zeroed)
return data;
if (p->object->port.type_id == TYPE_ID_MIDI) { if (p->object->port.type_id == TYPE_ID_MIDI) {
struct midi_buffer *mb = data; struct midi_buffer *mb = data;
mb->magic = MIDI_BUFFER_MAGIC; mb->magic = MIDI_BUFFER_MAGIC;
mb->buffer_size = MAX_BUFFER_FRAMES * sizeof(float); mb->buffer_size = MAX_BUFFER_FRAMES * sizeof(float);
mb->nframes = maxframes; mb->nframes = MAX_BUFFER_FRAMES;
mb->write_pos = 0; mb->write_pos = 0;
mb->event_count = 0; mb->event_count = 0;
mb->lost_events = 0; mb->lost_events = 0;
pw_log_debug("port %p: init midi buffer %p size:%d", p, data, mb->buffer_size); pw_log_debug("port %p: init midi buffer size:%d", p, mb->buffer_size);
} } else
else memset(data, 0, MAX_BUFFER_FRAMES * sizeof(float));
memset(data, 0, maxframes * sizeof(float));
p->zeroed = true;
return data;
} }
static int client_node_port_use_buffers(void *object, static int client_node_port_use_buffers(void *object,
@ -1689,10 +1695,6 @@ static int client_node_port_use_buffers(void *object,
"consider increasing RLIMIT_MEMLOCK" : strerror(errno)); "consider increasing RLIMIT_MEMLOCK" : strerror(errno));
} }
} }
init_buffer(p, p->emptyptr, MAX_BUFFER_FRAMES);
p->zeroed = true;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT); SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
if (direction == SPA_DIRECTION_OUTPUT) if (direction == SPA_DIRECTION_OUTPUT)
reuse_buffer(c, mix, b->id); reuse_buffer(c, mix, b->id);
@ -2964,6 +2966,8 @@ jack_port_t * jack_port_register (jack_client_t *client,
snprintf(o->port.name, sizeof(o->port.name), "%s:%s", c->name, port_name); snprintf(o->port.name, sizeof(o->port.name), "%s:%s", c->name, port_name);
o->port.type_id = type_id; o->port.type_id = type_id;
init_buffer(p);
pw_log_debug(NAME" %p: port %p", c, p); pw_log_debug(NAME" %p: port %p", c, p);
spa_list_init(&p->mix); spa_list_init(&p->mix);
@ -3159,11 +3163,7 @@ void * jack_port_get_buffer (jack_port_t *port, jack_nframes_t frames)
break; break;
} }
if (ptr == NULL) { if (ptr == NULL) {
ptr = p->emptyptr; ptr = init_buffer(p);
if (!p->zeroed) {
init_buffer(p, ptr, MAX_BUFFER_FRAMES);
p->zeroed = true;
}
} }
} else { } else {
switch (p->object->port.type_id) { switch (p->object->port.type_id) {