LADI
/
spa
1
Fork 0
Code

jack: sort midi events better 

Use the same sorting as ardour for midi events with the same timestamp
so that the order is:

Controller messages > Program Change > Note Off > Note On >
    Note Pressure > Channel Pressure > Pitch Bend

Fixes #1868
This commit is contained in:
Wim Taymans 2022-12-13 11:11:30 +01:00
parent 61750813ff
commit 480902eb3a
2 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pipewire-jack/src/pipewire-jack.c
View File

@ -1002,6 +1002,38 @@ static inline void fix_midi_event(uint8_t *data, size_t size)
}
}
static inline int event_sort(struct spa_pod_control *a, struct spa_pod_control *b)
{
if (a->offset < b->offset)
return -1;
if (a->offset > b->offset)
return 1;
if (a->type != b->type)
return 0;
switch(a->type) {
case SPA_CONTROL_Midi:
{
/* 11 (controller) > 12 (program change) >
* 8 (note off) > 9 (note on) > 10 (aftertouch) >
* 13 (channel pressure) > 14 (pitch bend) */
static int priotab[] = { 5,4,3,7,6,2,1,0 };
uint8_t *da, *db;
if (SPA_POD_BODY_SIZE(&a->value) < 1 ||
SPA_POD_BODY_SIZE(&b->value) < 1)
return 0;
da = SPA_POD_BODY(&a->value);
db = SPA_POD_BODY(&b->value);
if ((da[0] & 0xf) != (db[0] & 0xf))
return 0;
return priotab[db[0] >> 5] - priotab[da[0] >> 5];
}
default:
return 0;
}
}
static void convert_to_midi(struct spa_pod_sequence **seq, uint32_t n_seq, void *midi, bool fix)
{
struct spa_pod_control *c[n_seq];
@ -1014,15 +1046,13 @@ static void convert_to_midi(struct spa_pod_sequence **seq, uint32_t n_seq, void
while (true) {
struct spa_pod_control *next = NULL;
uint32_t next_index = 0;
uint8_t *data;
size_t size;
for (i = 0; i < n_seq; i++) {
if (!spa_pod_control_is_inside(&seq[i]->body,
SPA_POD_BODY_SIZE(seq[i]), c[i]))
continue;
if (next == NULL || c[i]->offset < next->offset) {
if (next == NULL || event_sort(c[i], next) <= 0) {
next = c[i];
next_index = i;
}
@ -1030,11 +1060,12 @@ static void convert_to_midi(struct spa_pod_sequence **seq, uint32_t n_seq, void
if (SPA_UNLIKELY(next == NULL))
break;
data = SPA_POD_BODY(&next->value);
size = SPA_POD_BODY_SIZE(&next->value);
switch(next->type) {
case SPA_CONTROL_Midi:
{
uint8_t *data = SPA_POD_BODY(&next->value);
size_t size = SPA_POD_BODY_SIZE(&next->value);
if (fix)
fix_midi_event(data, size);
@ -1043,6 +1074,7 @@ static void convert_to_midi(struct spa_pod_sequence **seq, uint32_t n_seq, void
spa_strerror(res));
break;
}
}
c[next_index] = spa_pod_control_next(c[next_index]);
}
}

35
spa/plugins/control/mixer.c
View File

@ -37,6 +37,7 @@
#include <spa/node/io.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/param.h>
#include <spa/control/control.h>
#include <spa/pod/filter.h>
#define NAME "control-mixer"
@ -571,6 +572,38 @@ static int impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t
return queue_buffer(this, port, &port->buffers[buffer_id]);
}
static inline int event_sort(struct spa_pod_control *a, struct spa_pod_control *b)
{
if (a->offset < b->offset)
return -1;
if (a->offset > b->offset)
return 1;
if (a->type != b->type)
return 0;
switch(a->type) {
case SPA_CONTROL_Midi:
{
/* 11 (controller) > 12 (program change) >
* 8 (note off) > 9 (note on) > 10 (aftertouch) >
* 13 (channel pressure) > 14 (pitch bend) */
static int priotab[] = { 5,4,3,7,6,2,1,0 };
uint8_t *da, *db;
if (SPA_POD_BODY_SIZE(&a->value) < 1 ||
SPA_POD_BODY_SIZE(&b->value) < 1)
return 0;
da = SPA_POD_BODY(&a->value);
db = SPA_POD_BODY(&b->value);
if ((da[0] & 0xf) != (db[0] & 0xf))
return 0;
return priotab[db[0] >> 5] - priotab[da[0] >> 5];
}
default:
return 0;
}
}
static int impl_node_process(void *object)
{
struct impl *this = object;
@ -664,7 +697,7 @@ static int impl_node_process(void *object)
SPA_POD_BODY_SIZE(seq[i]), ctrl[i]))
continue;
if (next == NULL || ctrl[i]->offset < next->offset) {
if (next == NULL || event_sort(ctrl[i], next) <= 0) {
next = ctrl[i];
next_index = i;
}