X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ffixed_delay.cc;h=70af271b81925de0d767c1e8f34aedd2c8f32a88;hb=c0a94b8399b76240415aab0e3f12e0950d4a26a9;hp=d59619cdf9fe30e64a7497d9d1056da3d95bc9b2;hpb=681b65aa0b68c9e7a686de2d6ca0c18c61cb444b;p=ardour.git

diff --git a/libs/ardour/fixed_delay.cc b/libs/ardour/fixed_delay.cc
index d59619cdf9..70af271b81 100644
--- a/libs/ardour/fixed_delay.cc
+++ b/libs/ardour/fixed_delay.cc
@@ -25,8 +25,8 @@ using namespace ARDOUR;
 
 FixedDelay::FixedDelay ()
 	: _max_delay (0)
+	, _buf_size (0)
 	, _delay (0)
-	, _pending_flush (false)
 {
 	for (size_t i = 0; i < DataType::num_types; ++i) {
 		_buffers.push_back (BufferVec ());
@@ -39,25 +39,6 @@ FixedDelay::~FixedDelay ()
 	clear ();
 }
 
-void
-FixedDelay::configure (const ChanCount& count, framecnt_t max_delay)
-{
-	if (max_delay <= _max_delay || count <= _count) {
-		return;
-	}
-	_max_delay = std::max (_max_delay, max_delay);
-	for (DataType::iterator i = DataType::begin (); i != DataType::end (); ++i) {
-		ensure_buffers (*i, count.get (*i), _max_delay + 1);
-	}
-}
-
-void
-FixedDelay::set (const ChanCount& count, framecnt_t delay)
-{
-	configure (count, delay);
-	_delay = delay;
-}
-
 void
 FixedDelay::ensure_buffers (DataType type, size_t num_buffers, size_t buffer_capacity)
 {
@@ -92,15 +73,57 @@ FixedDelay::clear ()
 	_count.reset ();
 }
 
+void
+FixedDelay::flush()
+{
+	for (std::vector<BufferVec>::iterator i = _buffers.begin (); i != _buffers.end (); ++i) {
+		for (BufferVec::iterator j = (*i).begin (); j != (*i).end (); ++j) {
+			(*j)->buf->silence (_buf_size);
+		}
+	}
+}
+
+void
+FixedDelay::configure (const ChanCount& count, samplecnt_t max_delay, bool shrink)
+{
+	if (shrink) {
+		if (max_delay == _max_delay && count == _count) {
+			return;
+		}
+		_max_delay = max_delay;
+	} else if (max_delay <= _max_delay && count <= _count) {
+		return;
+	} else {
+		_max_delay = std::max (_max_delay, max_delay);
+	}
+
+	// max possible (with all engines and during export)
+	static const samplecnt_t max_block_length = 8192;
+	_buf_size = _max_delay + max_block_length;
+	for (DataType::iterator i = DataType::begin (); i != DataType::end (); ++i) {
+		ensure_buffers (*i, count.get (*i), _buf_size);
+	}
+}
+
+void
+FixedDelay::set (const ChanCount& count, samplecnt_t delay)
+{
+	configure (count, delay, false);
+	if (_delay != delay) {
+		flush ();
+	}
+	_delay = delay;
+}
+
 void
 FixedDelay::delay (
 		ARDOUR::DataType dt, uint32_t id,
 		Buffer& out, const Buffer& in,
-		pframes_t n_frames,
-		framecnt_t dst_offset, framecnt_t src_offset)
+		pframes_t n_samples,
+		samplecnt_t dst_offset, samplecnt_t src_offset)
 {
 	if (_delay == 0) {
-		out.read_from (in, n_frames, dst_offset, src_offset);
+		out.read_from (in, n_samples, dst_offset, src_offset);
 		return;
 	}
 
@@ -108,25 +131,25 @@ FixedDelay::delay (
 	assert (id < _buffers[dt].size ());
 	DelayBuffer *db = _buffers[dt][id];
 
-	if (db->pos + n_frames > _max_delay) {
-		uint32_t w0 = _max_delay - db->pos;
-		uint32_t w1 = db->pos + n_frames - _max_delay;
+	if (db->pos + n_samples > _buf_size) {
+		uint32_t w0 = _buf_size - db->pos;
+		uint32_t w1 = db->pos + n_samples - _buf_size;
 		db->buf->read_from (in, w0, db->pos, src_offset);
 		db->buf->read_from (in, w1, 0, src_offset + w0);
 	} else {
-		db->buf->read_from (in, n_frames, db->pos, src_offset);
+		db->buf->read_from (in, n_samples, db->pos, src_offset);
 	}
 
-	uint32_t rp = (db->pos + _max_delay - _delay) % _max_delay;
+	uint32_t rp = (db->pos + _buf_size - _delay) % _buf_size;
 
-	if (rp + n_frames > _max_delay) {
-		uint32_t r0 = _max_delay - rp;
-		uint32_t r1 = rp + n_frames - _max_delay;
+	if (rp + n_samples > _buf_size) {
+		uint32_t r0 = _buf_size - rp;
+		uint32_t r1 = rp + n_samples - _buf_size;
 		out.read_from (*db->buf, r0, dst_offset, rp);
 		out.read_from (*db->buf, r1, dst_offset + r0, 0);
 	} else {
-		out.read_from (*db->buf, n_frames, dst_offset, rp);
+		out.read_from (*db->buf, n_samples, dst_offset, rp);
 	}
 
-	db->pos = (db->pos + n_frames) % _max_delay;
+	db->pos = (db->pos + n_samples) % _buf_size;
 }