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

Fix multi-channel delaylines #7409 part 2/2

Browse source
This commit is contained in:
Robin Gareus 2017-06-29 04:40:54 +02:00
parent 8e4eb42833
commit d4928e0765
2 changed files with 61 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/delayline.h
View file

@ -57,6 +57,8 @@ public:
XMLNode& state (bool full); XMLNode& state (bool full);
private: private:
void allocate_pending_buffers (framecnt_t);
friend class IO; friend class IO;
framecnt_t _delay, _pending_delay; framecnt_t _delay, _pending_delay;
framecnt_t _bsiz, _pending_bsiz; framecnt_t _bsiz, _pending_bsiz;

92
libs/ardour/delayline.cc
View file

@ -33,7 +33,7 @@ using namespace PBD;
using namespace ARDOUR; using namespace ARDOUR;
DelayLine::DelayLine (Session& s, const std::string& name) DelayLine::DelayLine (Session& s, const std::string& name)
: Processor (s, string_compose ("latency-compensation-%1", name)) : Processor (s, string_compose ("latency-compensation-%1-%2", name, this))
, _delay(0) , _delay(0)
, _pending_delay(0) , _pending_delay(0)
, _bsiz(0) , _bsiz(0)
@ -80,7 +80,7 @@ DelayLine::run (BufferSet& bufs, framepos_t /* start_frame */, framepos_t /* end
frameoffset_t wo = _pending_bsiz - wl; frameoffset_t wo = _pending_bsiz - wl;
for (pframes_t pos = 0; pos < FADE_LEN; ++pos) { for (pframes_t pos = 0; pos < FADE_LEN; ++pos) {
const gain_t gain = (gain_t)pos / (gain_t)FADE_LEN; const gain_t gain = (gain_t)pos / (gain_t)FADE_LEN;
for (c = 0; c < _configured_input.n_audio(); ++c) { for (c = 0; c < _configured_output.n_audio(); ++c) {
_pending_buf.get()[ wo * chn + c ] *= gain; _pending_buf.get()[ wo * chn + c ] *= gain;
wo = (wo + 1) % (_pending_bsiz + 1); wo = (wo + 1) % (_pending_bsiz + 1);
} }
@ -96,15 +96,15 @@ DelayLine::run (BufferSet& bufs, framepos_t /* start_frame */, framepos_t /* end
} }
ro += delay_diff; ro += delay_diff;
if (ro < 0) { if (ro < 0) {
ro -= (_pending_bsiz +1) * floor(ro / (float)(_pending_bsiz +1)); ro -= (_pending_bsiz + 1) * floor(ro / (float)(_pending_bsiz + 1));
} }
ro = ro % (_pending_bsiz + 1); ro = ro % (_pending_bsiz + 1);
for (pframes_t pos = 0; pos < FADE_LEN; ++pos) { for (pframes_t pos = 0; pos < FADE_LEN; ++pos) {
for (c = 0; c < _configured_input.n_audio(); ++c) { for (c = 0; c < _configured_output.n_audio(); ++c) {
_pending_buf.get()[ ro * chn + c ] = _buf.get()[ roold * chn + c ]; _pending_buf.get()[ ro * chn + c ] = _buf.get()[ roold * chn + c ];
ro = (ro + 1) % (_pending_bsiz + 1);
roold = (roold + 1) % (_bsiz + 1);
} }
ro = (ro + 1) % (_pending_bsiz + 1);
roold = (roold + 1) % (_bsiz + 1);
} }
} }
@ -137,16 +137,20 @@ DelayLine::run (BufferSet& bufs, framepos_t /* start_frame */, framepos_t /* end
// fade out at old position // fade out at old position
c = 0; c = 0;
for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i, ++c) { for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end() && c <= chn; ++i, ++c) {
Sample * const data = i->data(); Sample * const data = i->data();
frameoffset_t roff = _roff;
frameoffset_t woff = _woff;
for (pframes_t pos = 0; pos < fade_len; ++pos) { for (pframes_t pos = 0; pos < fade_len; ++pos) {
const gain_t gain = (gain_t)(fade_len - pos) / (gain_t)fade_len; const gain_t gain = (gain_t)(fade_len - pos) / (gain_t)fade_len;
buf[ _woff * chn + c ] = data[ pos ]; buf[ woff * chn + c ] = data[ pos ];
data[ pos ] = buf[ _roff * chn + c ] * gain; data[ pos ] = buf[ roff * chn + c ] * gain;
_roff = (_roff + 1) % rbs; roff = (roff + 1) % rbs;
_woff = (_woff + 1) % rbs; woff = (woff + 1) % rbs;
} }
} }
_roff = (_roff + fade_len) % rbs;
_woff = (_woff + fade_len) % rbs;
if (pending_flush) { if (pending_flush) {
DEBUG_TRACE (DEBUG::LatencyCompensation, DEBUG_TRACE (DEBUG::LatencyCompensation,
@ -164,16 +168,20 @@ DelayLine::run (BufferSet& bufs, framepos_t /* start_frame */, framepos_t /* end
// fade in at new position // fade in at new position
c = 0; c = 0;
for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i, ++c) { for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end() && c <= chn; ++i, ++c) {
Sample * const data = i->data(); Sample * const data = i->data();
frameoffset_t roff = _roff;
frameoffset_t woff = _woff;
for (pframes_t pos = fade_len; pos < 2 * fade_len; ++pos) { for (pframes_t pos = fade_len; pos < 2 * fade_len; ++pos) {
const gain_t gain = (gain_t)(pos - fade_len) / (gain_t)fade_len; const gain_t gain = (gain_t)(pos - fade_len) / (gain_t)fade_len;
buf[ _woff * chn + c ] = data[ pos ]; buf[ woff * chn + c ] = data[ pos ];
data[ pos ] = buf[ _roff * chn + c ] * gain; data[ pos ] = buf[ roff * chn + c ] * gain;
_roff = (_roff + 1) % rbs; roff = (roff + 1) % rbs;
_woff = (_woff + 1) % rbs; woff = (woff + 1) % rbs;
} }
} }
_roff = (_roff + fade_len) % rbs;
_woff = (_woff + fade_len) % rbs;
p0 = 2 * fade_len; p0 = 2 * fade_len;
_delay = pending_delay; _delay = pending_delay;
@ -186,15 +194,19 @@ DelayLine::run (BufferSet& bufs, framepos_t /* start_frame */, framepos_t /* end
assert(_delay == ((_woff - _roff + rbs) % rbs)); assert(_delay == ((_woff - _roff + rbs) % rbs));
c = 0; c = 0;
for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i, ++c) { for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end() && c <= chn; ++i, ++c) {
Sample * const data = i->data(); Sample * const data = i->data();
frameoffset_t roff = _roff;
frameoffset_t woff = _woff;
for (pframes_t pos = p0; pos < nsamples; ++pos) { for (pframes_t pos = p0; pos < nsamples; ++pos) {
buf[ _woff * chn + c ] = data[ pos ]; buf[ woff * chn + c ] = data[ pos ];
data[ pos ] = buf[ _roff * chn + c ]; data[ pos ] = buf[ roff * chn + c ];
_roff = (_roff + 1) % rbs; roff = (roff + 1) % rbs;
_woff = (_woff + 1) % rbs; woff = (woff + 1) % rbs;
} }
} }
_roff = (_roff + nsamples) % rbs;
_woff = (_woff + nsamples) % rbs;
} }
if (_midi_buf.get()) { if (_midi_buf.get()) {
@ -273,8 +285,6 @@ DelayLine::set_delay(framecnt_t signal_delay)
cerr << "WARNING: latency compensation is not possible.\n"; cerr << "WARNING: latency compensation is not possible.\n";
} }
const framecnt_t rbs = signal_delay + 1;
DEBUG_TRACE (DEBUG::LatencyCompensation, DEBUG_TRACE (DEBUG::LatencyCompensation,
string_compose ("%1 set_delay to %2 samples for %3 channels\n", string_compose ("%1 set_delay to %2 samples for %3 channels\n",
name(), signal_delay, _configured_output.n_audio())); name(), signal_delay, _configured_output.n_audio()));
@ -293,14 +303,7 @@ DelayLine::set_delay(framecnt_t signal_delay)
return; return;
} }
if (_configured_output.n_audio() > 0 ) { allocate_pending_buffers (signal_delay);
_pending_buf.reset(new Sample[_configured_output.n_audio() * rbs]);
memset(_pending_buf.get(), 0, _configured_output.n_audio() * rbs * sizeof (Sample));
_pending_bsiz = signal_delay;
} else {
_pending_buf.reset();
_pending_bsiz = 0;
}
_pending_delay = signal_delay; _pending_delay = signal_delay;
@ -316,6 +319,22 @@ DelayLine::can_support_io_configuration (const ChanCount& in, ChanCount& out)
return true; return true;
} }
void
DelayLine::allocate_pending_buffers (framecnt_t signal_delay)
{
assert (signal_delay >= 0);
const framecnt_t rbs = signal_delay + 1;
if (_configured_output.n_audio() > 0 ) {
_pending_buf.reset(new Sample[_configured_output.n_audio() * rbs]);
memset(_pending_buf.get(), 0, _configured_output.n_audio() * rbs * sizeof (Sample));
_pending_bsiz = signal_delay;
} else {
_pending_buf.reset();
_pending_bsiz = 0;
}
}
bool bool
DelayLine::configure_io (ChanCount in, ChanCount out) DelayLine::configure_io (ChanCount in, ChanCount out)
{ {
@ -323,13 +342,20 @@ DelayLine::configure_io (ChanCount in, ChanCount out)
return false; return false;
} }
// TODO realloc buffers if channel count changes.. if (_configured_output != out) {
// TODO support multiple midi buffers // run() won't be called concurrently, so it's
// save for replace existing _pending_buf.
//
// configure_io is either called with process-lock held
// from route's configure_io() or by use_target() from the c'tor.
allocate_pending_buffers (_pending_delay);
}
DEBUG_TRACE (DEBUG::LatencyCompensation, DEBUG_TRACE (DEBUG::LatencyCompensation,
string_compose ("configure IO: %1 Ain: %2 Aout: %3 Min: %4 Mout: %5\n", string_compose ("configure IO: %1 Ain: %2 Aout: %3 Min: %4 Mout: %5\n",
name(), in.n_audio(), out.n_audio(), in.n_midi(), out.n_midi())); name(), in.n_audio(), out.n_audio(), in.n_midi(), out.n_midi()));
// TODO support multiple midi buffers
if (in.n_midi() > 0 && !_midi_buf) { if (in.n_midi() > 0 && !_midi_buf) {
_midi_buf.reset(new MidiBuffer(16384)); _midi_buf.reset(new MidiBuffer(16384));
} }