mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-01 22:58:50 -04: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:
Wim Taymans
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)
|
||||
|
|
|
|||
|
|
@ -273,29 +273,34 @@ static void midi_to_jack(struct impl *impl, float *dst, float *src, uint32_t n_s
|
|||
|
||||
while (spa_pod_parser_get_control_body(&parser, &c, &c_body) >= 0) {
|
||||
int 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, &tmp[tmp_size], sizeof(tmp) - tmp_size);
|
||||
if (size <= 0)
|
||||
continue;
|
||||
while (c_size > 0) {
|
||||
size = spa_ump_to_midi((const uint32_t**)&c_body, &c_size,
|
||||
&tmp[tmp_size], sizeof(tmp) - tmp_size, &state);
|
||||
if (size <= 0)
|
||||
break;
|
||||
|
||||
if (impl->fix_midi)
|
||||
fix_midi_event(&tmp[tmp_size], size);
|
||||
if (impl->fix_midi)
|
||||
fix_midi_event(&tmp[tmp_size], size);
|
||||
|
||||
if (!in_sysex && tmp[tmp_size] == 0xf0)
|
||||
in_sysex = true;
|
||||
if (!in_sysex && tmp[tmp_size] == 0xf0)
|
||||
in_sysex = true;
|
||||
|
||||
tmp_size += size;
|
||||
if (in_sysex && tmp[tmp_size-1] == 0xf7)
|
||||
in_sysex = false;
|
||||
tmp_size += size;
|
||||
if (in_sysex && tmp[tmp_size-1] == 0xf7)
|
||||
in_sysex = false;
|
||||
|
||||
if (!in_sysex) {
|
||||
if ((res = jack.midi_event_write(dst, c.offset, tmp, tmp_size)) < 0)
|
||||
pw_log_warn("midi %p: can't write event: %s", dst,
|
||||
spa_strerror(res));
|
||||
tmp_size = 0;
|
||||
if (!in_sysex) {
|
||||
if ((res = jack.midi_event_write(dst, c.offset, tmp, tmp_size)) < 0)
|
||||
pw_log_warn("midi %p: can't write event: %s", dst,
|
||||
spa_strerror(res));
|
||||
tmp_size = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -333,32 +333,36 @@ static void midi_to_netjack2(struct netjack2_peer *peer,
|
|||
int size;
|
||||
uint8_t data[16];
|
||||
bool was_sysex = in_sysex;
|
||||
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;
|
||||
while (c_size > 0) {
|
||||
size = spa_ump_to_midi((const uint32_t**)&c_body, &c_size, data, sizeof(data), &state);
|
||||
if (size <= 0)
|
||||
break;
|
||||
|
||||
if (c.offset >= n_samples) {
|
||||
buf->lost_events++;
|
||||
continue;
|
||||
if (c.offset >= n_samples) {
|
||||
buf->lost_events++;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!in_sysex && data[0] == 0xf0)
|
||||
in_sysex = true;
|
||||
|
||||
if (!in_sysex && peer->fix_midi)
|
||||
fix_midi_event(data, size);
|
||||
|
||||
if (in_sysex && data[size-1] == 0xf7)
|
||||
in_sysex = false;
|
||||
|
||||
if (was_sysex)
|
||||
n2j_midi_buffer_append(buf, data, size);
|
||||
else
|
||||
n2j_midi_buffer_write(buf, c.offset, data, size);
|
||||
}
|
||||
|
||||
if (!in_sysex && data[0] == 0xf0)
|
||||
in_sysex = true;
|
||||
|
||||
if (!in_sysex && peer->fix_midi)
|
||||
fix_midi_event(data, size);
|
||||
|
||||
if (in_sysex && data[size-1] == 0xf7)
|
||||
in_sysex = false;
|
||||
|
||||
if (was_sysex)
|
||||
n2j_midi_buffer_append(buf, data, size);
|
||||
else
|
||||
n2j_midi_buffer_write(buf, c.offset, data, size);
|
||||
}
|
||||
if (buf->write_pos > 0)
|
||||
memmove(SPA_PTROFF(buf, sizeof(*buf) + buf->event_count * sizeof(struct nj2_midi_event), void),
|
||||
|
|
|
|||
|
|
@ -437,57 +437,61 @@ static void rtp_midi_flush_packets(struct impl *impl,
|
|||
while (spa_pod_parser_get_control_body(parser, &c, &c_body) >= 0) {
|
||||
uint32_t delta, offset;
|
||||
uint8_t event[16];
|
||||
size_t size;
|
||||
int 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, event, sizeof(event));
|
||||
if (size <= 0)
|
||||
continue;
|
||||
while (c_size > 0) {
|
||||
size = spa_ump_to_midi((const uint32_t **)&c_body, &c_size, event, sizeof(event), &state);
|
||||
if (size <= 0)
|
||||
break;
|
||||
|
||||
offset = c.offset * impl->rate / rate;
|
||||
offset = c.offset * impl->rate / rate;
|
||||
|
||||
if (len > 0 && (len + size > max_size ||
|
||||
offset - base > impl->psamples)) {
|
||||
/* flush packet when we have one and when it's either
|
||||
* too large or has too much data. */
|
||||
if (len < 16) {
|
||||
midi_header.b = 0;
|
||||
midi_header.len = len;
|
||||
iov[1].iov_len = sizeof(midi_header) - 1;
|
||||
} else {
|
||||
midi_header.b = 1;
|
||||
midi_header.len = (len >> 8) & 0xf;
|
||||
midi_header.len_b = len & 0xff;
|
||||
iov[1].iov_len = sizeof(midi_header);
|
||||
if (len > 0 && (len + size > max_size ||
|
||||
offset - base > impl->psamples)) {
|
||||
/* flush packet when we have one and when it's either
|
||||
* too large or has too much data. */
|
||||
if (len < 16) {
|
||||
midi_header.b = 0;
|
||||
midi_header.len = len;
|
||||
iov[1].iov_len = sizeof(midi_header) - 1;
|
||||
} else {
|
||||
midi_header.b = 1;
|
||||
midi_header.len = (len >> 8) & 0xf;
|
||||
midi_header.len_b = len & 0xff;
|
||||
iov[1].iov_len = sizeof(midi_header);
|
||||
}
|
||||
iov[2].iov_len = len;
|
||||
|
||||
pw_log_trace("sending %d timestamp:%d %u %u",
|
||||
len, timestamp + base,
|
||||
offset, impl->psamples);
|
||||
rtp_stream_emit_send_packet(impl, iov, 3);
|
||||
|
||||
impl->seq++;
|
||||
len = 0;
|
||||
}
|
||||
iov[2].iov_len = len;
|
||||
if ((unsigned int)size > BUFFER_SIZE || len > BUFFER_SIZE - size) {
|
||||
pw_log_error("Buffer overflow prevented!");
|
||||
return; // FIXME: what to do instead?
|
||||
}
|
||||
if (len == 0) {
|
||||
/* start new packet */
|
||||
base = prev_offset = offset;
|
||||
header.sequence_number = htons(impl->seq);
|
||||
header.timestamp = htonl(impl->ts_offset + timestamp + base);
|
||||
|
||||
pw_log_trace("sending %d timestamp:%d %u %u",
|
||||
len, timestamp + base,
|
||||
offset, impl->psamples);
|
||||
rtp_stream_emit_send_packet(impl, iov, 3);
|
||||
|
||||
impl->seq++;
|
||||
len = 0;
|
||||
}
|
||||
if (size > BUFFER_SIZE || len > BUFFER_SIZE - size) {
|
||||
pw_log_error("Buffer overflow prevented!");
|
||||
return; // FIXME: what to do instead?
|
||||
}
|
||||
if (len == 0) {
|
||||
/* start new packet */
|
||||
base = prev_offset = offset;
|
||||
header.sequence_number = htons(impl->seq);
|
||||
header.timestamp = htonl(impl->ts_offset + timestamp + base);
|
||||
|
||||
memcpy(&impl->buffer[len], event, size);
|
||||
len += size;
|
||||
} else {
|
||||
delta = offset - prev_offset;
|
||||
prev_offset = offset;
|
||||
len += write_event(&impl->buffer[len], BUFFER_SIZE - len, delta, event, size);
|
||||
memcpy(&impl->buffer[len], event, size);
|
||||
len += size;
|
||||
} else {
|
||||
delta = offset - prev_offset;
|
||||
prev_offset = offset;
|
||||
len += write_event(&impl->buffer[len], BUFFER_SIZE - len, delta, event, size);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (len > 0) {
|
||||
|
|
|
|||
|
|
@ -239,27 +239,32 @@ static void vban_midi_flush_packets(struct impl *impl,
|
|||
while (spa_pod_parser_get_control_body(parser, &c, &c_body) >= 0) {
|
||||
int size;
|
||||
uint8_t event[16];
|
||||
uint64_t state = 0;
|
||||
size_t c_size = c.value.size;
|
||||
|
||||
if (c.type != SPA_CONTROL_UMP)
|
||||
continue;
|
||||
|
||||
size = spa_ump_to_midi(c_body, c.value.size, event, sizeof(event));
|
||||
if (size <= 0)
|
||||
continue;
|
||||
while (c_size > 0) {
|
||||
size = spa_ump_to_midi((const uint32_t**)&c_body,
|
||||
&c_size, event, sizeof(event), &state);
|
||||
if (size <= 0)
|
||||
break;
|
||||
|
||||
if (len == 0) {
|
||||
/* start new packet */
|
||||
header.n_frames++;
|
||||
} else if (len + size > impl->mtu) {
|
||||
/* flush packet when we have one and when it's too large */
|
||||
iov[1].iov_len = len;
|
||||
if (len == 0) {
|
||||
/* start new packet */
|
||||
header.n_frames++;
|
||||
} else if (len + size > impl->mtu) {
|
||||
/* flush packet when we have one and when it's too large */
|
||||
iov[1].iov_len = len;
|
||||
|
||||
pw_log_debug("sending %d", len);
|
||||
vban_stream_emit_send_packet(impl, iov, 2);
|
||||
len = 0;
|
||||
pw_log_debug("sending %d", len);
|
||||
vban_stream_emit_send_packet(impl, iov, 2);
|
||||
len = 0;
|
||||
}
|
||||
memcpy(&impl->buffer[len], event, size);
|
||||
len += size;
|
||||
}
|
||||
memcpy(&impl->buffer[len], event, size);
|
||||
len += size;
|
||||
}
|
||||
if (len > 0) {
|
||||
/* flush last packet */
|
||||
|
|
|
|||
|
|
@ -496,41 +496,46 @@ int midi_file_write_event(struct midi_file *mf, const struct midi_event *event)
|
|||
{
|
||||
struct midi_track *tr;
|
||||
uint32_t tick;
|
||||
void *data;
|
||||
void *data, *ev_data;
|
||||
size_t size;
|
||||
int res;
|
||||
int res, ev_size;
|
||||
uint8_t ev[32];
|
||||
uint64_t state = 0;
|
||||
|
||||
spa_return_val_if_fail(event != NULL, -EINVAL);
|
||||
spa_return_val_if_fail(mf != NULL, -EINVAL);
|
||||
spa_return_val_if_fail(event->track == 0, -EINVAL);
|
||||
spa_return_val_if_fail(event->size > 1, -EINVAL);
|
||||
|
||||
switch (event->type) {
|
||||
case MIDI_EVENT_TYPE_MIDI1:
|
||||
data = event->data;
|
||||
size = event->size;
|
||||
break;
|
||||
case MIDI_EVENT_TYPE_UMP:
|
||||
data = ev;
|
||||
size = spa_ump_to_midi((uint32_t*)event->data, event->size, ev, sizeof(ev));
|
||||
if (size == 0)
|
||||
return 0;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
data = event->data;
|
||||
size = event->size;
|
||||
|
||||
tr = &mf->tracks[event->track];
|
||||
|
||||
tick = (uint32_t)(event->sec * (1000000.0 * mf->info.division) / (double)mf->tempo);
|
||||
|
||||
CHECK_RES(write_varlen(mf, tr, tick - tr->tick));
|
||||
tr->tick = tick;
|
||||
while (size > 0) {
|
||||
switch (event->type) {
|
||||
case MIDI_EVENT_TYPE_MIDI1:
|
||||
ev_data = data;
|
||||
ev_size = size;
|
||||
size = 0;
|
||||
break;
|
||||
case MIDI_EVENT_TYPE_UMP:
|
||||
ev_size = spa_ump_to_midi((const uint32_t**)&data, &size, ev, sizeof(ev), &state);
|
||||
if (ev_size <= 0)
|
||||
return ev_size;
|
||||
ev_data = ev;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
CHECK_RES(write_n(mf->file, data, size));
|
||||
tr->size += size;
|
||||
CHECK_RES(write_varlen(mf, tr, tick - tr->tick));
|
||||
tr->tick = tick;
|
||||
|
||||
CHECK_RES(write_n(mf->file, ev_data, ev_size));
|
||||
tr->size += ev_size;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue