X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport_insert.cc;h=c5d941428f99bdf8eade2acb27cd0f0ac4f8d281;hb=9a2164056752a958542f2d162ed3bf0f9c304121;hp=dee661db4157c5e05e7bd781aca1b16066b2a41b;hpb=c83389b8ec5fef9553a401e6123b7e55702af9e2;p=ardour.git diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc index dee661db41..c5d941428f 100644 --- a/libs/ardour/port_insert.cc +++ b/libs/ardour/port_insert.cc @@ -23,14 +23,15 @@ #include "pbd/failed_constructor.h" #include "pbd/xml++.h" +#include "ardour/audioengine.h" +#include "ardour/audio_port.h" +#include "ardour/buffer_set.h" #include "ardour/delivery.h" -#include "ardour/port_insert.h" +#include "ardour/mtdm.h" #include "ardour/plugin.h" #include "ardour/port.h" +#include "ardour/port_insert.h" #include "ardour/route.h" -#include "ardour/buffer_set.h" - -#include "ardour/audioengine.h" #include "ardour/session.h" #include "ardour/types.h" @@ -40,36 +41,104 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PortInsert::PortInsert (Session& s, boost::shared_ptr mm) +PortInsert::PortInsert (Session& s, boost::shared_ptr pannable, boost::shared_ptr mm) : IOProcessor (s, true, true, string_compose (_("insert %1"), (bitslot = s.next_insert_id()) + 1), "") - , _out (new Delivery (s, _output, mm, _name, Delivery::Insert)) + , _out (new Delivery (s, _output, pannable, mm, _name, Delivery::Insert)) { - ProcessorCreated (this); /* EMIT SIGNAL */ + _mtdm = 0; + _latency_detect = false; + _latency_flush_frames = false; + _measured_latency = 0; } -PortInsert::PortInsert (Session& s, boost::shared_ptr mm, const XMLNode& node) - : IOProcessor (s, true, true, "unnamed port insert") - , _out (new Delivery (s, _output, mm, _name, Delivery::Insert)) +PortInsert::~PortInsert () +{ + _session.unmark_insert_id (bitslot); + delete _mtdm; +} +void +PortInsert::start_latency_detection () { - if (set_state (node, Stateful::loading_state_version)) { - throw failed_constructor(); - } + if (_mtdm != 0) { + delete _mtdm; + } + + _mtdm = new MTDM; + _latency_flush_frames = false; + _latency_detect = true; + _measured_latency = 0; +} - ProcessorCreated (this); /* EMIT SIGNAL */ +void +PortInsert::stop_latency_detection () +{ + _latency_flush_frames = signal_latency() + _session.engine().frames_per_cycle(); + _latency_detect = false; } -PortInsert::~PortInsert () +void +PortInsert::set_measured_latency (framecnt_t n) { + _measured_latency = n; +} + +framecnt_t +PortInsert::latency() const +{ + /* because we deliver and collect within the same cycle, + all I/O is necessarily delayed by at least frames_per_cycle(). + + if the return port for insert has its own latency, we + need to take that into account too. + */ + + if (_measured_latency == 0) { + return _session.engine().frames_per_cycle() + _input->latency(); + } else { + return _measured_latency; + } } void -PortInsert::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool) +PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool) { if (_output->n_ports().n_total() == 0) { return; } + if (_latency_detect) { + + if (_input->n_ports().n_audio() != 0) { + + AudioBuffer& outbuf (_output->ports().nth_audio_port(0)->get_audio_buffer (nframes)); + Sample* in = _input->ports().nth_audio_port(0)->get_audio_buffer (nframes).data(); + Sample* out = outbuf.data(); + + _mtdm->process (nframes, in, out); + + outbuf.set_is_silent (false); + } + + return; + + } else if (_latency_flush_frames) { + + /* wait for the entire input buffer to drain before picking up input again so that we can't + hear the remnants of whatever MTDM pumped into the pipeline. + */ + + silence (nframes); + + if (_latency_flush_frames > nframes) { + _latency_flush_frames -= nframes; + } else { + _latency_flush_frames = 0; + } + + return; + } + if (!_active && !_pending_active) { /* deliver silence */ silence (nframes); @@ -92,11 +161,15 @@ PortInsert::get_state(void) XMLNode& PortInsert::state (bool full) { - XMLNode& node = Processor::state(full); + XMLNode& node = IOProcessor::state(full); char buf[32]; node.add_property ("type", "port"); snprintf (buf, sizeof (buf), "%" PRIu32, bitslot); node.add_property ("bitslot", buf); + snprintf (buf, sizeof (buf), "%" PRId64, _measured_latency); + node.add_property("latency", buf); + snprintf (buf, sizeof (buf), "%u", _session.get_block_size()); + node.add_property("block_size", buf); return node; } @@ -109,6 +182,18 @@ PortInsert::set_state (const XMLNode& node, int version) XMLPropertyList plist; const XMLProperty *prop; + const XMLNode* insert_node = &node; + + // legacy sessions: search for child Redirect node + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { + if ((*niter)->name() == "Redirect") { + insert_node = *niter; + break; + } + } + + IOProcessor::set_state (*insert_node, version); + if ((prop = node.property ("type")) == 0) { error << _("XML node describing port insert is missing the `type' field") << endmsg; return -1; @@ -119,29 +204,30 @@ PortInsert::set_state (const XMLNode& node, int version) return -1; } + uint32_t blocksize = 0; + if ((prop = node.property ("block_size")) != 0) { + sscanf (prop->value().c_str(), "%u", &blocksize); + } + + //if the jack period is the same as when the value was saved, we can recall our latency.. + if ( (_session.get_block_size() == blocksize) && (prop = node.property ("latency")) != 0) { + uint32_t latency = 0; + sscanf (prop->value().c_str(), "%u", &latency); + _measured_latency = latency; + } + if ((prop = node.property ("bitslot")) == 0) { bitslot = _session.next_insert_id(); } else { + _session.unmark_insert_id (bitslot); sscanf (prop->value().c_str(), "%" PRIu32, &bitslot); _session.mark_insert_id (bitslot); } - const XMLNode* insert_node = &node; - - // legacy sessions: search for child IOProcessor node - for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() == "IOProcessor") { - insert_node = *niter; - break; - } - } - - Processor::set_state (*insert_node, version); - return 0; } -ARDOUR::nframes_t +ARDOUR::framecnt_t PortInsert::signal_latency() const { /* because we deliver and collect within the same cycle, @@ -151,12 +237,19 @@ PortInsert::signal_latency() const need to take that into account too. */ - return _session.engine().frames_per_cycle() + _input->signal_latency(); + if (_measured_latency == 0) { + return _session.engine().frames_per_cycle() + _input->signal_latency(); + } else { + return _measured_latency; + } } +/** Caller must hold process lock */ bool PortInsert::configure_io (ChanCount in, ChanCount out) { + assert (!AudioEngine::instance()->process_lock().trylock()); + /* for an insert, processor input corresponds to IO output, and vice versa */ if (_input->ensure_io (in, false, this) != 0) {