mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2026-02-22 01:40:33 -05:00
control: improve UMP to Midi conversiom
Improve the spa_ump_to_midi function so that it can consume multiple UMP messages and produce multiple midi messages. Some UMP messages (like program changes) need to be translated into up to 3 midi messages. Do this byt adding a state to the function and by making it consume the input bytes, just like the spa_ump_from_midi function. Adapt code to this new world. This is a little API break..
This commit is contained in:
parent
bf10458604
commit
e35a8554f8
13 changed files with 307 additions and 228 deletions
|
|
@ -345,27 +345,32 @@ static void midi_to_ffado(struct port *p, float *src, uint32_t n_samples)
|
|||
while (spa_pod_parser_get_control_body(&parser, &c, &c_body) >= 0) {
|
||||
uint8_t data[16];
|
||||
int j, size;
|
||||
size_t c_size = c.value.size;
|
||||
uint64_t state = 0;
|
||||
|
||||
if (c.type != SPA_CONTROL_UMP)
|
||||
continue;
|
||||
|
||||
size = spa_ump_to_midi(c_body, c.value.size, data, sizeof(data));
|
||||
if (size <= 0)
|
||||
continue;
|
||||
|
||||
if (index < c.offset)
|
||||
index = SPA_ROUND_UP_N(c.offset, 8);
|
||||
for (j = 0; j < size; j++) {
|
||||
if (index >= n_samples) {
|
||||
/* keep events that don't fit for the next cycle */
|
||||
if (p->event_pos < sizeof(p->event_buffer))
|
||||
p->event_buffer[p->event_pos++] = data[j];
|
||||
|
||||
while (c_size > 0) {
|
||||
size = spa_ump_to_midi((const uint32_t**)&c_body, &c_size, data, sizeof(data), &state);
|
||||
if (size <= 0)
|
||||
break;
|
||||
|
||||
for (j = 0; j < size; j++) {
|
||||
if (index >= n_samples) {
|
||||
/* keep events that don't fit for the next cycle */
|
||||
if (p->event_pos < sizeof(p->event_buffer))
|
||||
p->event_buffer[p->event_pos++] = data[j];
|
||||
else
|
||||
unhandled++;
|
||||
}
|
||||
else
|
||||
unhandled++;
|
||||
dst[index] = 0x01000000 | (uint32_t) data[j];
|
||||
index += 8;
|
||||
}
|
||||
else
|
||||
dst[index] = 0x01000000 | (uint32_t) data[j];
|
||||
index += 8;
|
||||
}
|
||||
}
|
||||
if (unhandled > 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue