mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: fix multiple midi input ports

Browse source 
On the midi input ports, do the same trick as on the output ports:
first convert the midi to JACK and then copy the whole buffer to the
port specific storage.

This makes it possible to have a different midi buffer per port and
allow multiple threads to get the buffer concurrently.

Fixes #3901
This commit is contained in:
Wim Taymans 2024-03-08 16:31:00 +01:00
parent 37900ff765
commit 1e92ecea53
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5267,7 +5267,8 @@ static void *get_buffer_input_float(struct port *p, jack_nframes_t frames)
static void *get_buffer_input_midi(struct port *p, jack_nframes_t frames) static void *get_buffer_input_midi(struct port *p, jack_nframes_t frames)
{ {
struct mix *mix; struct mix *mix;
void *ptr = midi_scratch; void *ptr = p->emptyptr;
struct midi_buffer *mb = (struct midi_buffer*)midi_scratch;
struct spa_pod_sequence *seq[MAX_MIX]; struct spa_pod_sequence *seq[MAX_MIX];
uint32_t n_seq = 0; uint32_t n_seq = 0;
@ -5296,8 +5297,17 @@ static void *get_buffer_input_midi(struct port *p, jack_nframes_t frames)
if (n_seq == MAX_MIX) if (n_seq == MAX_MIX)
break; break;
} }
midi_init_buffer(ptr, MIDI_SCRATCH_FRAMES); midi_init_buffer(mb, MIDI_SCRATCH_FRAMES);
convert_to_midi(seq, n_seq, ptr, p->client->fix_midi_events); /* first convert to a thread local scratch buffer, then memcpy into
* the per port buffer. This makes it possible to call this function concurrently
* but also have different pointers per port */
convert_to_midi(seq, n_seq, mb, p->client->fix_midi_events);
memcpy(ptr, mb, sizeof(struct midi_buffer) + (mb->event_count
* sizeof(struct midi_event)));
if (mb->write_pos) {
size_t offs = mb->buffer_size - 1 - mb->write_pos;
memcpy(ptr, SPA_PTROFF(mb, offs, void), mb->write_pos);
}
return ptr; return ptr;
} }