X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_graph_builder.cc;h=c7875c0b9b62ab1429f2e5ce23cc93d830f42f9d;hb=bb8cb93789b2eec65e4d82e5ceb64054673cbc4f;hp=3b1d1e383809e976b92f3b92868d2e76b174e4b9;hpb=8da27200d18fe4c471a759dde8e10d85ff29d277;p=ardour.git diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index 3b1d1e3838..c7875c0b9b 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -1,58 +1,79 @@ +/* + Copyright (C) 2008-2012 Paul Davis + Author: Sakari Bergen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + #include "ardour/export_graph_builder.h" -#include "audiographer/interleaver.h" -#include "audiographer/normalizer.h" -#include "audiographer/peak_reader.h" +#include + #include "audiographer/process_context.h" -#include "audiographer/sample_format_converter.h" -#include "audiographer/sndfile_writer.h" -#include "audiographer/sr_converter.h" -#include "audiographer/silence_trimmer.h" -#include "audiographer/threader.h" -#include "audiographer/tmp_file.h" -#include "audiographer/utils.h" +#include "audiographer/general/chunker.h" +#include "audiographer/general/interleaver.h" +#include "audiographer/general/normalizer.h" +#include "audiographer/general/peak_reader.h" +#include "audiographer/general/sample_format_converter.h" +#include "audiographer/general/sr_converter.h" +#include "audiographer/general/silence_trimmer.h" +#include "audiographer/general/threader.h" +#include "audiographer/sndfile/tmp_file.h" +#include "audiographer/sndfile/sndfile_writer.h" #include "ardour/audioengine.h" #include "ardour/export_channel_configuration.h" #include "ardour/export_filename.h" #include "ardour/export_format_specification.h" +#include "ardour/export_timespan.h" +#include "ardour/session_directory.h" #include "ardour/sndfile_helpers.h" -#include "pbd/filesystem.h" +#include "pbd/file_utils.h" +#include "pbd/cpus.h" using namespace AudioGrapher; +using std::string; namespace ARDOUR { ExportGraphBuilder::ExportGraphBuilder (Session const & session) : session (session) - , thread_pool (4) // FIXME thread amount to cores amount + , thread_pool (hardware_concurrency()) { process_buffer_frames = session.engine().frames_per_cycle(); - process_buffer = new Sample[process_buffer_frames]; - - // TODO move and/or use global silent buffers - AudioGrapher::Utils::init_zeros (process_buffer_frames); } ExportGraphBuilder::~ExportGraphBuilder () { - delete [] process_buffer; - - // TODO see bove - AudioGrapher::Utils::free_resources(); } int -ExportGraphBuilder::process (nframes_t frames, bool last_cycle) +ExportGraphBuilder::process (framecnt_t frames, bool last_cycle) { + assert(frames <= process_buffer_frames); + for (ChannelMap::iterator it = channels.begin(); it != channels.end(); ++it) { - it->first->read (process_buffer, process_buffer_frames); - ProcessContext context(process_buffer, process_buffer_frames, 1); - if (last_cycle) { context.set_flag (ProcessContext::EndOfInput); } + Sample const * process_buffer = 0; + it->first->read (process_buffer, frames); + ConstProcessContext context(process_buffer, frames, 1); + if (last_cycle) { context().set_flag (ProcessContext::EndOfInput); } it->second->process (context); } - + return 0; } @@ -66,20 +87,81 @@ ExportGraphBuilder::process_normalize () ++it; } } - + return normalizers.empty(); } +unsigned +ExportGraphBuilder::get_normalize_cycle_count() const +{ + unsigned max = 0; + for (std::list::const_iterator it = normalizers.begin(); it != normalizers.end(); ++it) { + max = std::max(max, (*it)->get_normalize_cycle_count()); + } + return max; +} + void ExportGraphBuilder::reset () { + timespan.reset(); channel_configs.clear (); channels.clear (); normalizers.clear (); } +void +ExportGraphBuilder::set_current_timespan (boost::shared_ptr span) +{ + timespan = span; +} + void ExportGraphBuilder::add_config (FileSpec const & config) +{ + ExportChannelConfiguration::ChannelList const & channels = + config.channel_config->get_channels(); + for(ExportChannelConfiguration::ChannelList::const_iterator it = channels.begin(); + it != channels.end(); ++it) { + (*it)->set_max_buffer_size(process_buffer_frames); + } + + // If the sample rate is "session rate", change it to the real value. + // However, we need to copy it to not change the config which is saved... + FileSpec new_config (config); + new_config.format.reset(new ExportFormatSpecification(*new_config.format, false)); + if(new_config.format->sample_rate() == ExportFormatBase::SR_Session) { + framecnt_t session_rate = session.nominal_frame_rate(); + new_config.format->set_sample_rate(ExportFormatBase::nearest_sample_rate(session_rate)); + } + + + if (!new_config.channel_config->get_split ()) { + add_split_config (new_config); + return; + } + + // Split channel configurations are split into several channel configurations, + // each corresponding to a file, at this stage + typedef std::list > ConfigList; + ConfigList file_configs; + new_config.channel_config->configurations_for_files (file_configs); + + unsigned chan = 1; + for (ConfigList::iterator it = file_configs.begin(); it != file_configs.end(); ++it, ++chan) { + FileSpec copy = new_config; + copy.channel_config = *it; + + copy.filename.reset (new ExportFilename (*copy.filename)); + copy.filename->include_channel = true; + copy.filename->set_channel (chan); + + add_split_config (copy); + } +} + +void +ExportGraphBuilder::add_split_config (FileSpec const & config) { for (ChannelConfigList::iterator it = channel_configs.begin(); it != channel_configs.end(); ++it) { if (*it == config) { @@ -87,11 +169,9 @@ ExportGraphBuilder::add_config (FileSpec const & config) return; } } - + // No duplicate channel config found, create new one - channel_configs.push_back (ChannelConfig (*this)); - ChannelConfig & c_config (channel_configs.back()); - c_config.init (config, channels); + channel_configs.push_back (new ChannelConfig (*this, config, channels)); } /* Encoder */ @@ -148,45 +228,56 @@ ExportGraphBuilder::Encoder::init_writer (boost::shared_ptrget_n_chans(); int format = get_real_format (config); - Glib::ustring filename = config.filename->get_path (config.format); - - writer.reset (new AudioGrapher::SndfileWriter (channels, config.format->sample_rate(), format, filename)); - writer->FileWritten.connect (sigc::mem_fun (*this, &ExportGraphBuilder::Encoder::copy_files)); + config.filename->set_channel_config(config.channel_config); + string filename = config.filename->get_path (config.format); + + writer.reset (new AudioGrapher::SndfileWriter (filename, format, channels, config.format->sample_rate(), config.broadcast_info)); + writer->FileWritten.connect_same_thread (copy_files_connection, boost::bind (&ExportGraphBuilder::Encoder::copy_files, this, _1)); } void ExportGraphBuilder::Encoder::copy_files (std::string orig_path) { while (filenames.size()) { - FilenamePtr & filename = filenames.front(); - PBD::sys::copy_file (orig_path, filename->get_path (config.format).c_str()); + ExportFilenamePtr & filename = filenames.front(); + PBD::copy_file (orig_path, filename->get_path (config.format).c_str()); filenames.pop_front(); } } /* SFC */ -ExportGraphBuilder::FloatSinkPtr -ExportGraphBuilder::SFC::init (FileSpec const & new_config, nframes_t max_frames) +ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &, FileSpec const & new_config, framecnt_t max_frames) + : data_width(0) { config = new_config; data_width = sndfile_data_width (Encoder::get_real_format (config)); unsigned channels = new_config.channel_config->get_n_chans(); - + if (data_width == 8 || data_width == 16) { short_converter = ShortConverterPtr (new SampleFormatConverter (channels)); short_converter->init (max_frames, config.format->dither_type(), data_width); add_child (config); - return short_converter; } else if (data_width == 24 || data_width == 32) { int_converter = IntConverterPtr (new SampleFormatConverter (channels)); int_converter->init (max_frames, config.format->dither_type(), data_width); add_child (config); - return int_converter; } else { + int actual_data_width = 8 * sizeof(Sample); float_converter = FloatConverterPtr (new SampleFormatConverter (channels)); - float_converter->init (max_frames, config.format->dither_type(), data_width); + float_converter->init (max_frames, config.format->dither_type(), actual_data_width); add_child (config); + } +} + +ExportGraphBuilder::FloatSinkPtr +ExportGraphBuilder::SFC::sink () +{ + if (data_width == 8 || data_width == 16) { + return short_converter; + } else if (data_width == 24 || data_width == 32) { + return int_converter; + } else { return float_converter; } } @@ -194,16 +285,16 @@ ExportGraphBuilder::SFC::init (FileSpec const & new_config, nframes_t max_frames void ExportGraphBuilder::SFC::add_child (FileSpec const & new_config) { - for (std::list::iterator it = children.begin(); it != children.end(); ++it) { + for (boost::ptr_list::iterator it = children.begin(); it != children.end(); ++it) { if (*it == new_config) { it->add_child (new_config); return; } } - - children.push_back (Encoder()); + + children.push_back (new Encoder()); Encoder & encoder = children.back(); - + if (data_width == 8 || data_width == 16) { short_converter->add_output (encoder.init (new_config)); } else if (data_width == 24 || data_width == 32) { @@ -221,43 +312,55 @@ ExportGraphBuilder::SFC::operator== (FileSpec const & other_config) const /* Normalizer */ -ExportGraphBuilder::FloatSinkPtr -ExportGraphBuilder::Normalizer::init (FileSpec const & new_config, nframes_t /*max_frames*/) +ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t /*max_frames*/) + : parent (parent) { + std::string tmpfile_path = parent.session.session_directory().export_path(); + tmpfile_path = Glib::build_filename(tmpfile_path, "XXXXXX"); + char tmpfile_path_buf[tmpfile_path.size() + 1]; + std::copy(tmpfile_path.begin(), tmpfile_path.end(), tmpfile_path_buf); + tmpfile_path_buf[tmpfile_path.size()] = '\0'; + config = new_config; - max_frames_out = 4086; // TODO good chunk size + uint32_t const channels = config.channel_config->get_n_chans(); + max_frames_out = 4086 - (4086 % channels); // TODO good chunk size - buffer.reset (new AllocatingProcessContext (max_frames_out, config.channel_config->get_n_chans())); + buffer.reset (new AllocatingProcessContext (max_frames_out, channels)); peak_reader.reset (new PeakReader ()); normalizer.reset (new AudioGrapher::Normalizer (config.format->normalize_target())); threader.reset (new Threader (parent.thread_pool)); - + normalizer->alloc_buffer (max_frames_out); normalizer->add_output (threader); - + int format = ExportFormatBase::F_RAW | ExportFormatBase::SF_Float; - tmp_file.reset (new TmpFile (config.channel_config->get_n_chans(), - config.format->sample_rate(), format)); - tmp_file->FileWritten.connect (sigc::hide (sigc::mem_fun (*this, &Normalizer::start_post_processing))); - + tmp_file.reset (new TmpFile (tmpfile_path_buf, format, channels, config.format->sample_rate())); + tmp_file->FileWritten.connect_same_thread (post_processing_connection, + boost::bind (&Normalizer::start_post_processing, this)); + add_child (new_config); - + peak_reader->add_output (tmp_file); +} + +ExportGraphBuilder::FloatSinkPtr +ExportGraphBuilder::Normalizer::sink () +{ return peak_reader; } void ExportGraphBuilder::Normalizer::add_child (FileSpec const & new_config) { - for (std::list::iterator it = children.begin(); it != children.end(); ++it) { + for (boost::ptr_list::iterator it = children.begin(); it != children.end(); ++it) { if (*it == new_config) { it->add_child (new_config); return; } } - - children.push_back (SFC (parent)); - threader->add_output (children.back().init (new_config, max_frames_out)); + + children.push_back (new SFC (parent, new_config, max_frames_out)); + threader->add_output (children.back().sink()); } bool @@ -267,36 +370,46 @@ ExportGraphBuilder::Normalizer::operator== (FileSpec const & other_config) const config.format->normalize_target() == other_config.format->normalize_target(); } +unsigned +ExportGraphBuilder::Normalizer::get_normalize_cycle_count() const +{ + return static_cast(std::ceil(static_cast(tmp_file->get_frames_written()) / + max_frames_out)); +} + bool ExportGraphBuilder::Normalizer::process() { - ProcessContext buffer_copy (*buffer); - tmp_file->read (buffer_copy); - normalizer->process (buffer_copy); - return buffer_copy.frames() != buffer->frames(); + framecnt_t frames_read = tmp_file->read (*buffer); + return frames_read != buffer->frames(); } void ExportGraphBuilder::Normalizer::start_post_processing() { normalizer->set_peak (peak_reader->get_peak()); - tmp_file->seek (0, SndfileReader::SeekBeginning); + tmp_file->seek (0, SEEK_SET); + tmp_file->add_output (normalizer); parent.normalizers.push_back (this); } /* SRC */ -ExportGraphBuilder::FloatSinkPtr -ExportGraphBuilder::SRC::init (FileSpec const & new_config, nframes_t max_frames) +ExportGraphBuilder::SRC::SRC (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) + : parent (parent) { config = new_config; converter.reset (new SampleRateConverter (new_config.channel_config->get_n_chans())); ExportFormatSpecification & format = *new_config.format; converter->init (parent.session.nominal_frame_rate(), format.sample_rate(), format.src_quality()); max_frames_out = converter->allocate_buffers (max_frames); - + add_child (new_config); - +} + +ExportGraphBuilder::FloatSinkPtr +ExportGraphBuilder::SRC::sink () +{ return converter; } @@ -312,17 +425,17 @@ ExportGraphBuilder::SRC::add_child (FileSpec const & new_config) template void -ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, std::list & list) +ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, boost::ptr_list & list) { - for (typename std::list::iterator it = list.begin(); it != list.end(); ++it) { + for (typename boost::ptr_list::iterator it = list.begin(); it != list.end(); ++it) { if (*it == new_config) { it->add_child (new_config); return; } } - - list.push_back (T (parent)); - converter->add_output (list.back().init (new_config, max_frames_out)); + + list.push_back (new T (parent, new_config, max_frames_out)); + converter->add_output (list.back().sink ()); } bool @@ -332,37 +445,44 @@ ExportGraphBuilder::SRC::operator== (FileSpec const & other_config) const } /* SilenceHandler */ -ExportGraphBuilder::FloatSinkPtr -ExportGraphBuilder::SilenceHandler::init (FileSpec const & new_config, nframes_t max_frames) +ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) + : parent (parent) { config = new_config; max_frames_in = max_frames; - nframes_t sample_rate = parent.session.nominal_frame_rate(); - - silence_trimmer.reset (new SilenceTrimmer()); + framecnt_t sample_rate = parent.session.nominal_frame_rate(); + + silence_trimmer.reset (new SilenceTrimmer(max_frames_in)); silence_trimmer->set_trim_beginning (config.format->trim_beginning()); silence_trimmer->set_trim_end (config.format->trim_end()); - silence_trimmer->add_silence_to_beginning (config.format->silence_beginning(sample_rate)); - silence_trimmer->add_silence_to_end (config.format->silence_end(sample_rate)); - silence_trimmer->limit_output_size (max_frames_in); - + + framecnt_t sb = config.format->silence_beginning_at (parent.timespan->get_start(), sample_rate); + framecnt_t se = config.format->silence_end_at (parent.timespan->get_end(), sample_rate); + + silence_trimmer->add_silence_to_beginning (sb); + silence_trimmer->add_silence_to_end (se); + add_child (new_config); - +} + +ExportGraphBuilder::FloatSinkPtr +ExportGraphBuilder::SilenceHandler::sink () +{ return silence_trimmer; } void ExportGraphBuilder::SilenceHandler::add_child (FileSpec const & new_config) { - for (std::list::iterator it = children.begin(); it != children.end(); ++it) { + for (boost::ptr_list::iterator it = children.begin(); it != children.end(); ++it) { if (*it == new_config) { it->add_child (new_config); return; } } - - children.push_back (SRC (parent)); - silence_trimmer->add_output (children.back().init (new_config, max_frames_in)); + + children.push_back (new SRC (parent, new_config, max_frames_in)); + silence_trimmer->add_output (children.back().sink()); } bool @@ -372,23 +492,30 @@ ExportGraphBuilder::SilenceHandler::operator== (FileSpec const & other_config) c ExportFormatSpecification & other_format = *other_config.format; return (format.trim_beginning() == other_format.trim_beginning()) && (format.trim_end() == other_format.trim_end()) && - (format.silence_beginning() == other_format.silence_beginning()) && - (format.silence_end() == other_format.silence_end()); + (format.silence_beginning_time() == other_format.silence_beginning_time()) && + (format.silence_end_time() == other_format.silence_end_time()); } /* ChannelConfig */ -void -ExportGraphBuilder::ChannelConfig::init (FileSpec const & new_config, ChannelMap & channel_map) +ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, FileSpec const & new_config, ChannelMap & channel_map) + : parent (parent) { typedef ExportChannelConfiguration::ChannelList ChannelList; - + config = new_config; - max_frames = parent.session.engine().frames_per_cycle(); - + + framecnt_t max_frames = parent.session.engine().frames_per_cycle(); interleaver.reset (new Interleaver ()); interleaver->init (new_config.channel_config->get_n_chans(), max_frames); - + + // Make the chunk size divisible by the channel count + int chan_count = new_config.channel_config->get_n_chans(); + max_frames_out = 8192; + max_frames_out -= max_frames_out % chan_count; + chunker.reset (new Chunker (max_frames_out)); + interleaver->add_output(chunker); + ChannelList const & channel_list = config.channel_config->get_channels(); unsigned chan = 0; for (ChannelList::const_iterator it = channel_list.begin(); it != channel_list.end(); ++it, ++chan) { @@ -401,23 +528,24 @@ ExportGraphBuilder::ChannelConfig::init (FileSpec const & new_config, ChannelMap } map_it->second->add_output (interleaver->input (chan)); } - + add_child (new_config); } void ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config) { - for (std::list::iterator it = children.begin(); it != children.end(); ++it) { + assert (*this == new_config); + + for (boost::ptr_list::iterator it = children.begin(); it != children.end(); ++it) { if (*it == new_config) { it->add_child (new_config); return; } } - - children.push_back (SilenceHandler (parent)); - nframes_t max_frames_out = new_config.channel_config->get_n_chans() * max_frames; - interleaver->add_output (children.back().init (new_config, max_frames_out)); + + children.push_back (new SilenceHandler (parent, new_config, max_frames_out)); + chunker->add_output (children.back().sink ()); } bool