X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel.cc;h=66fec3a53b4127057070b83d41f4e2e954ec8deb;hb=11b02e90ac9b084cd25741b7a6bdc91c59749c16;hp=c612b1f6684e6af3488138d3b9bdbb1c4347a1cd;hpb=3f30e8093e1c78bb722196ecb48d9c7cbdd279c3;p=ardour.git diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index c612b1f668..66fec3a53b 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -23,14 +23,47 @@ #include "ardour/audio_track.h" #include "ardour/audioengine.h" #include "ardour/audioregion.h" +#include "ardour/capturing_processor.h" #include "ardour/export_channel.h" #include "ardour/export_failed.h" #include "ardour/session.h" #include "pbd/error.h" +#include "pbd/i18n.h" + using namespace ARDOUR; +PortExportChannel::PortExportChannel () + : _buffer_size (0) +{ +} + +PortExportChannel::~PortExportChannel () +{ + _delaylines.clear (); +} + +void PortExportChannel::set_max_buffer_size(samplecnt_t samples) +{ + _buffer_size = samples; + _buffer.reset (new Sample[samples]); + + _delaylines.clear (); + + for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) { + boost::shared_ptr p = it->lock (); + if (!p) { continue; } + samplecnt_t latency = p->private_latency_range (true).max; + PBD::RingBuffer* rb = new PBD::RingBuffer (latency + 1 + _buffer_size); + for (samplepos_t i = 0; i < latency; ++i) { + Sample zero = 0; + rb->write (&zero, 1); + } + _delaylines.push_back (boost::shared_ptr >(rb)); + } +} + bool PortExportChannel::operator< (ExportChannel const & other) const { @@ -42,19 +75,41 @@ PortExportChannel::operator< (ExportChannel const & other) const } void -PortExportChannel::read (Sample * data, framecnt_t frames) const +PortExportChannel::read (Sample const *& data, samplecnt_t samples) const { - memset (data, 0, frames * sizeof (float)); + assert(_buffer); + assert(samples <= _buffer_size); - for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) { - if (*it != 0) { - Sample* port_buffer = (*it)->get_audio_buffer(frames).data(); + if (ports.size() == 1 && _delaylines.size() ==1 && _delaylines.front()->bufsize () == _buffer_size + 1) { + boost::shared_ptr p = ports.begin()->lock (); + AudioBuffer& ab (p->get_audio_buffer(samples)); // unsets AudioBuffer::_written + data = ab.data(); + ab.set_written (true); + return; + } - for (uint32_t i = 0; i < frames; ++i) { - data[i] += (float) port_buffer[i]; - } + memset (_buffer.get(), 0, samples * sizeof (Sample)); + + std::list > >::const_iterator di = _delaylines.begin (); + for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) { + boost::shared_ptr p = it->lock (); + if (!p) { + continue; + } + AudioBuffer& ab (p->get_audio_buffer(samples)); // unsets AudioBuffer::_written + Sample* port_buffer = ab.data(); + ab.set_written (true); + (*di)->write (port_buffer, samples); + // TODO optimze, get_read_vector() + for (uint32_t i = 0; i < samples; ++i) { + Sample spl; + (*di)->read (&spl, 1); + _buffer[i] += spl; } + ++di; } + + data = _buffer.get(); } void @@ -62,8 +117,9 @@ PortExportChannel::get_state (XMLNode * node) const { XMLNode * port_node; for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) { - if ((port_node = node->add_child ("Port"))) { - port_node->add_property ("name", (*it)->name()); + boost::shared_ptr p = it->lock (); + if (p && (port_node = node->add_child ("Port"))) { + port_node->set_property ("name", p->name()); } } } @@ -71,12 +127,11 @@ PortExportChannel::get_state (XMLNode * node) const void PortExportChannel::set_state (XMLNode * node, Session & session) { - XMLProperty * prop; XMLNodeList xml_ports = node->children ("Port"); for (XMLNodeList::iterator it = xml_ports.begin(); it != xml_ports.end(); ++it) { - if ((prop = (*it)->property ("name"))) { - std::string const & name = prop->value(); - AudioPort * port = dynamic_cast (session.engine().get_port_by_name (name)); + std::string name; + if ((*it)->get_property ("name", name)) { + boost::shared_ptr port = boost::dynamic_pointer_cast (session.engine().get_port_by_name (name)); if (port) { ports.insert (port); } else { @@ -86,17 +141,14 @@ PortExportChannel::set_state (XMLNode * node, Session & session) } } -RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type) : - region (region), - track (track), - type (type), - frames_per_cycle (session->engine().frames_per_cycle ()), - buffers_up_to_date (false), - region_start (region.position()), - position (region_start), - - mixdown_buffer (0), - gain_buffer (0) +RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type) + : region (region) + , track (track) + , type (type) + , samples_per_cycle (session->engine().samples_per_cycle ()) + , buffers_up_to_date (false) + , region_start (region.position()) + , position (region_start) { switch (type) { case Raw: @@ -105,9 +157,9 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio case Fades: n_channels = region.n_channels(); - mixdown_buffer = new Sample [frames_per_cycle]; - gain_buffer = new Sample [frames_per_cycle]; - memset (gain_buffer, 1.0, sizeof (Sample) * frames_per_cycle); + mixdown_buffer.reset (new Sample [samples_per_cycle]); + gain_buffer.reset (new Sample [samples_per_cycle]); + std::fill_n (gain_buffer.get(), samples_per_cycle, Sample (1.0)); break; case Processed: @@ -119,14 +171,12 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio session->ProcessExport.connect_same_thread (export_connection, boost::bind (&RegionExportChannelFactory::new_cycle_started, this, _1)); - buffers.ensure_buffers (DataType::AUDIO, n_channels, frames_per_cycle); + buffers.ensure_buffers (DataType::AUDIO, n_channels, samples_per_cycle); buffers.set_count (ChanCount (DataType::AUDIO, n_channels)); } RegionExportChannelFactory::~RegionExportChannelFactory () { - delete[] mixdown_buffer; - delete[] gain_buffer; } ExportChannelPtr @@ -137,43 +187,122 @@ RegionExportChannelFactory::create (uint32_t channel) } void -RegionExportChannelFactory::read (uint32_t channel, Sample * data, framecnt_t frames_to_read) +RegionExportChannelFactory::read (uint32_t channel, Sample const *& data, samplecnt_t samples_to_read) { assert (channel < n_channels); - assert (frames_to_read <= frames_per_cycle); + assert (samples_to_read <= samples_per_cycle); if (!buffers_up_to_date) { - update_buffers(frames_to_read); + update_buffers(samples_to_read); buffers_up_to_date = true; } - memcpy (data, buffers.get_audio (channel).data(), frames_to_read * sizeof (Sample)); + data = buffers.get_audio (channel).data(); } void -RegionExportChannelFactory::update_buffers (framecnt_t frames) +RegionExportChannelFactory::update_buffers (samplecnt_t samples) { - assert (frames <= frames_per_cycle); + assert (samples <= samples_per_cycle); switch (type) { case Raw: for (size_t channel = 0; channel < n_channels; ++channel) { - region.read (buffers.get_audio (channel).data(), position - region_start, frames, channel); + region.read (buffers.get_audio (channel).data(), position - region_start, samples, channel); } break; case Fades: assert (mixdown_buffer && gain_buffer); for (size_t channel = 0; channel < n_channels; ++channel) { - memset (mixdown_buffer, 0, sizeof (Sample) * frames); - region.read_at (buffers.get_audio (channel).data(), mixdown_buffer, gain_buffer, position, frames, channel); + memset (mixdown_buffer.get(), 0, sizeof (Sample) * samples); + buffers.get_audio (channel).silence(samples); + region.read_at (buffers.get_audio (channel).data(), mixdown_buffer.get(), gain_buffer.get(), position, samples, channel); } break; - case Processed: - track.export_stuff (buffers, position, frames); + case Processed: + track.export_stuff (buffers, position, samples, track.main_outs(), true, true, false); break; - default: + default: throw ExportFailed ("Unhandled type in ExportChannelFactory::update_buffers"); } - position += frames; + position += samples; +} + + +RouteExportChannel::RouteExportChannel(boost::shared_ptr processor, size_t channel, + boost::shared_ptr remover) + : processor (processor) + , channel (channel) + , remover (remover) +{ +} + +RouteExportChannel::~RouteExportChannel() +{ +} + +void +RouteExportChannel::create_from_route(std::list & result, boost::shared_ptr route) +{ + boost::shared_ptr processor = route->add_export_point(); + uint32_t channels = processor->input_streams().n_audio(); + + boost::shared_ptr remover (new ProcessorRemover (route, processor)); + result.clear(); + for (uint32_t i = 0; i < channels; ++i) { + result.push_back (ExportChannelPtr (new RouteExportChannel (processor, i, remover))); + } +} + +void +RouteExportChannel::set_max_buffer_size(samplecnt_t samples) +{ + if (processor) { + processor->set_block_size (samples); + } +} + +void +RouteExportChannel::read (Sample const *& data, samplecnt_t samples) const +{ + assert(processor); + AudioBuffer const & buffer = processor->get_capture_buffers().get_audio (channel); +#ifndef NDEBUG + (void) samples; +#else + assert (samples <= (samplecnt_t) buffer.capacity()); +#endif + data = buffer.data(); +} + +void +RouteExportChannel::get_state (XMLNode *) const +{ + // TODO +} + +void +RouteExportChannel::set_state (XMLNode *, Session &) +{ + // TODO +} + +bool +RouteExportChannel::operator< (ExportChannel const & other) const +{ + RouteExportChannel const * rec; + if ((rec = dynamic_cast(&other)) == 0) { + return this < &other; + } + + if (processor.get() == rec->processor.get()) { + return channel < rec->channel; + } + return processor.get() < rec->processor.get(); +} + +RouteExportChannel::ProcessorRemover::~ProcessorRemover() +{ + route->remove_processor (processor); }