mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ump: handle sysex from UMP to MIDI1 better

Browse source 
SysEx in UMP can span multiple packets. In MIDI1 we can't split them up
into multiple events so we need to collect the complete sysex and then
write out the event.

Fixes SysEx writes to ALSA seq by running the event encoder until a
valid packet is completed.

Also fixes split MIDI1 packets in the JACK API when going through the
tunnel or via netjack.
This commit is contained in:
Wim Taymans 2025-03-17 18:05:06 +01:00
parent 750b88c3ca
commit 1cbe4e1782
4 changed files with 143 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/plugins/alsa/alsa-seq.c
View file

@ -78,6 +78,7 @@ static int seq_open(struct seq_state *state, struct seq_conn *conn, bool with_qu
spa_log_debug(state->log, "%p: ALSA UMP MIDI enabled", state);
state->ump = true;
}
state->ump = false;
return 0;
}
@ -821,6 +822,7 @@ static int process_write(struct seq_state *state)
struct spa_pod_control *c;
uint64_t out_time;
snd_seq_real_time_t out_rt;
bool first = true;
if (!port->valid || io == NULL)
continue;
@ -885,13 +887,20 @@ static int process_write(struct seq_state *state)
if ((size = spa_ump_to_midi((uint32_t *)body, body_size, data, sizeof(data))) <= 0)
continue;
snd_seq_ev_clear(&ev);
if (first)
snd_seq_ev_clear(&ev);
snd_midi_event_reset_encode(stream->codec);
if ((size = snd_midi_event_encode(stream->codec, data, size, &ev)) <= 0) {
if ((size = snd_midi_event_encode(stream->codec, data, size, &ev)) < 0) {
spa_log_warn(state->log, "failed to encode event: %s", snd_strerror(size));
snd_midi_event_reset_encode(stream->codec);
first = true;
continue;
}
first = false;
if (ev.type == SND_SEQ_EVENT_NONE)
/* this can happen when the event is not complete yet, like
* a sysex message and we need to encode some more data. */
continue;
snd_seq_ev_set_source(&ev, state->event.addr.port);
snd_seq_ev_set_dest(&ev, port->addr.client, port->addr.port);
@ -901,6 +910,7 @@ static int process_write(struct seq_state *state)
spa_log_warn(state->log, "failed to output event: %s",
snd_strerror(err));
}
first = true;
}
}
}