smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

CoreMIDI: fix capture/playback alignment

Browse source 
MIDI playback used samples instead of usec.
MIDI capture used time-stamp from previous cycle.
buffer-size changes were not applied to MIDI port latency
This commit is contained in:
Robin Gareus 2023-06-27 18:57:25 +02:00
parent bef4596dd1
commit e6bed9330f
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
3 changed files with 58 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

45
libs/backends/coreaudio/coremidi_io.cc
View file

@ -103,7 +103,7 @@ static void midiInputCallback(const MIDIPacketList *list, void *procRef, void *s
#endif
if (rb->write_space() > sizeof(uint32_t) + len) {
rb->write ((uint8_t*)&len, sizeof(uint32_t));
rb->write ((uint8_t*)p, len);
rb->write ((uint8_t const*)p, len);
}
#ifndef NDEBUG
else {
@ -144,7 +144,9 @@ CoreMidiIo::CoreMidiIo()
, _rb (0)
, _n_midi_in (0)
, _n_midi_out (0)
, _time_at_cycle_start (0)
, _send_start (0)
, _recv_start (0)
, _recv_end (0)
, _active (false)
, _enabled (true)
, _run (false)
@ -196,9 +198,17 @@ CoreMidiIo::cleanup()
}
void
CoreMidiIo::start_cycle()
CoreMidiIo::start_cycle (MIDITimeStamp time_at_cycle_start, double cycle_time_us)
{
_time_at_cycle_start = AudioGetCurrentHostTime();
_send_start = time_at_cycle_start;
_recv_end = time_at_cycle_start;
MIDITimeStamp cycle_time = AudioConvertNanosToHostTime (cycle_time_us);
if (cycle_time <= time_at_cycle_start) {
_recv_start = time_at_cycle_start - cycle_time;
} else {
_recv_start = 0;
}
}
void
@ -242,9 +252,9 @@ CoreMidiIo::notify_proc(const MIDINotification *message)
}
size_t
CoreMidiIo::recv_event (uint32_t port, double cycle_time_us, uint64_t &time, uint8_t *d, size_t &s)
CoreMidiIo::recv_event (uint32_t port, uint64_t &time, uint8_t *d, size_t &s)
{
if (!_active || _time_at_cycle_start == 0) {
if (!_active || _recv_start == 0) {
return 0;
}
assert(port < _n_midi_in);
@ -266,18 +276,15 @@ CoreMidiIo::recv_event (uint32_t port, double cycle_time_us, uint64_t &time, uin
_input_queue[port].push_back(std::shared_ptr<CoreMIDIPacket>(new _CoreMIDIPacket ((MIDIPacket*)&packet)));
}
UInt64 start = _time_at_cycle_start;
UInt64 end = AudioConvertNanosToHostTime(AudioConvertHostTimeToNanos(_time_at_cycle_start) + cycle_time_us * 1e3);
for (CoreMIDIQueue::iterator it = _input_queue[port].begin (); it != _input_queue[port].end (); ) {
if ((*it)->timeStamp < end) {
if ((*it)->timeStamp < start) {
uint64_t dt = AudioConvertHostTimeToNanos(start - (*it)->timeStamp);
if ((*it)->timeStamp < _recv_end) {
if ((*it)->timeStamp < _recv_start) {
uint64_t dt = AudioConvertHostTimeToNanos(_recv_start - (*it)->timeStamp);
/* note: it used to be 10ms (insert handwavy explanation about percievable latency)
* turns out some midi-keyboads connected via bluetooth can be late by as much as 50ms
* https://discourse.ardour.org/t/ardour-not-getting-all-messages-from-midi-keyboard/107618/13?
*/
if (dt > 6e7 && (*it)->timeStamp != 0) { // 60ms slack and a timestamp is given
if (dt > 8e7 && (*it)->timeStamp != 0) { // 60ms slack and a timestamp is given
#ifndef NDEBUG
printf("Dropped Stale Midi Event. dt:%.2fms\n", dt * 1e-6);
#endif
@ -298,7 +305,7 @@ CoreMidiIo::recv_event (uint32_t port, double cycle_time_us, uint64_t &time, uin
}
time = 0;
} else {
time = AudioConvertHostTimeToNanos((*it)->timeStamp - start);
time = AudioConvertHostTimeToNanos((*it)->timeStamp - _recv_start);
}
s = std::min(s, (size_t) (*it)->length);
if (s > 0) {
@ -308,7 +315,7 @@ CoreMidiIo::recv_event (uint32_t port, double cycle_time_us, uint64_t &time, uin
return s;
} else {
#ifndef NDEBUG
uint64_t dt = AudioConvertHostTimeToNanos((*it)->timeStamp - end);
uint64_t dt = AudioConvertHostTimeToNanos((*it)->timeStamp - _recv_end);
printf("Postponed future Midi Event. dt:%.2fms\n", dt * 1e-6);
#endif
}
@ -319,15 +326,15 @@ CoreMidiIo::recv_event (uint32_t port, double cycle_time_us, uint64_t &time, uin
}
int
CoreMidiIo::send_event (uint32_t port, double reltime_us, const uint8_t *d, const size_t s)
CoreMidiIo::send_event (uint32_t port, double reltime_ns, const uint8_t *d, const size_t s)
{
if (!_active || _time_at_cycle_start == 0) {
if (!_active || _send_start == 0) {
return 0;
}
assert(port < _n_midi_out);
UInt64 ts = AudioConvertHostTimeToNanos(_time_at_cycle_start);
ts += reltime_us * 1e3;
UInt64 ts = AudioConvertHostTimeToNanos(_send_start);
ts += reltime_ns;
// TODO use a single packet list.. queue all events first..
MIDIPacketList pl;