X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_graph_builder.cc;h=2e9972b47d14e2d04b4933a594673ec4592901c5;hb=4203e7c9035e98987519fac3c6058d1a3279791b;hp=127546e8fc9af86b94c6739811a7169b2c7ae772;hpb=07d94b9b4868fad26c9e8ac2ae4901849a09b8ac;p=ardour.git diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index 127546e8fc..2e9972b47d 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -1,20 +1,20 @@ /* - Copyright (C) 2008-2012 Paul Davis - Author: Sakari Bergen + 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 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. + 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. + 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. */ @@ -28,12 +28,15 @@ #include "audiographer/general/chunker.h" #include "audiographer/general/interleaver.h" #include "audiographer/general/normalizer.h" +#include "audiographer/general/analyser.h" #include "audiographer/general/peak_reader.h" +#include "audiographer/general/loudness_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/tmp_file_rt.h" #include "audiographer/sndfile/sndfile_writer.h" #include "ardour/audioengine.h" @@ -53,10 +56,10 @@ using std::string; namespace ARDOUR { ExportGraphBuilder::ExportGraphBuilder (Session const & session) - : session (session) - , thread_pool (hardware_concurrency()) + : session (session) + , thread_pool (hardware_concurrency()) { - process_buffer_frames = session.engine().frames_per_cycle(); + process_buffer_frames = session.engine().samples_per_cycle(); } ExportGraphBuilder::~ExportGraphBuilder () @@ -110,6 +113,18 @@ ExportGraphBuilder::reset () channel_configs.clear (); channels.clear (); normalizers.clear (); + analysis_map.clear(); +} + +void +ExportGraphBuilder::cleanup (bool remove_out_files/*=false*/) +{ + ChannelConfigList::iterator iter = channel_configs.begin(); + + while (iter != channel_configs.end() ) { + iter->remove_children(remove_out_files); + iter = channel_configs.erase(iter); + } } void @@ -162,6 +177,16 @@ ExportGraphBuilder::add_config (FileSpec const & config) } } +void +ExportGraphBuilder::get_analysis_results (AnalysisResults& results) { + for (AnalysisMap::iterator i = analysis_map.begin(); i != analysis_map.end(); ++i) { + ExportAnalysisPtr p = i->second->result (); + if (p) { + results.insert (std::make_pair (i->first, p)); + } + } +} + void ExportGraphBuilder::add_split_config (FileSpec const & config) { @@ -211,6 +236,33 @@ ExportGraphBuilder::Encoder::add_child (FileSpec const & new_config) filenames.push_back (new_config.filename); } +void +ExportGraphBuilder::Encoder::destroy_writer (bool delete_out_file) +{ + if (delete_out_file ) { + + if (float_writer) { + float_writer->close (); + } + + if (int_writer) { + int_writer->close (); + } + + if (short_writer) { + short_writer->close (); + } + + if (std::remove(writer_filename.c_str() ) != 0) { + std::cout << "Encoder::destroy_writer () : Error removing file: " << strerror(errno) << std::endl; + } + } + + float_writer.reset (); + int_writer.reset (); + short_writer.reset (); +} + bool ExportGraphBuilder::Encoder::operator== (FileSpec const & other_config) const { @@ -231,9 +283,9 @@ ExportGraphBuilder::Encoder::init_writer (boost::shared_ptrget_n_chans(); int format = get_real_format (config); config.filename->set_channel_config(config.channel_config); - string filename = config.filename->get_path (config.format); + writer_filename = config.filename->get_path (config.format); - writer.reset (new AudioGrapher::SndfileWriter (filename, format, channels, config.format->sample_rate(), config.broadcast_info)); + writer.reset (new AudioGrapher::SndfileWriter (writer_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)); } @@ -249,33 +301,62 @@ ExportGraphBuilder::Encoder::copy_files (std::string orig_path) /* SFC */ -ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &, FileSpec const & new_config, framecnt_t max_frames) - : data_width(0) +ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &parent, 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(); + _analyse = config.format->analyse(); + if (_analyse) { + framecnt_t sample_rate = parent.session.nominal_frame_rate(); + 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); + framecnt_t duration = parent.timespan->get_length () + sb + se; + max_frames = min ((framecnt_t) 8192 * channels, max ((framecnt_t) 4096 * channels, max_frames)); + chunker.reset (new Chunker (max_frames)); + analyser.reset (new Analyser (config.format->sample_rate(), channels, max_frames, + (framecnt_t) ceil (duration * config.format->sample_rate () / (double) sample_rate))); + chunker->add_output (analyser); + + config.filename->set_channel_config (config.channel_config); + parent.add_analyser (config.filename->get_path (config.format), analyser); + } 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); + if (_analyse) { analyser->add_output (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); + if (_analyse) { analyser->add_output (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(), actual_data_width); add_child (config); + if (_analyse) { analyser->add_output (float_converter); } + } +} + +void +ExportGraphBuilder::SFC::set_peak (float gain) +{ + if (_analyse) { + analyser->set_normalization_gain (gain); } } ExportGraphBuilder::FloatSinkPtr ExportGraphBuilder::SFC::sink () { - if (data_width == 8 || data_width == 16) { + if (_analyse) { + return chunker; + } else if (data_width == 8 || data_width == 16) { return short_converter; } else if (data_width == 24 || data_width == 32) { return int_converter; @@ -306,6 +387,20 @@ ExportGraphBuilder::SFC::add_child (FileSpec const & new_config) } } +void +ExportGraphBuilder::SFC::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator iter = children.begin (); + + while (iter != children.end() ) { + + if (remove_out_files) { + iter->destroy_writer(remove_out_files); + } + iter = children.erase (iter); + } +} + bool ExportGraphBuilder::SFC::operator== (FileSpec const & other_config) const { @@ -314,8 +409,9 @@ ExportGraphBuilder::SFC::operator== (FileSpec const & other_config) const /* Normalizer */ -ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t /*max_frames*/) - : parent (parent) +ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) + : parent (parent) + , use_loudness (false) { std::string tmpfile_path = parent.session.session_directory().export_path(); tmpfile_path = Glib::build_filename(tmpfile_path, "XXXXXX"); @@ -326,10 +422,12 @@ ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpe config = new_config; uint32_t const channels = config.channel_config->get_n_chans(); max_frames_out = 4086 - (4086 % channels); // TODO good chunk size - + use_loudness = config.format->normalize_loudness (); + buffer.reset (new AllocatingProcessContext (max_frames_out, channels)); peak_reader.reset (new PeakReader ()); - normalizer.reset (new AudioGrapher::Normalizer (config.format->normalize_target())); + loudness_reader.reset (new LoudnessReader (config.format->sample_rate(), channels, max_frames)); + normalizer.reset (new AudioGrapher::Normalizer (use_loudness ? 0.0 : config.format->normalize_dbfs())); threader.reset (new Threader (parent.thread_pool)); normalizer->alloc_buffer (max_frames_out); @@ -342,12 +440,19 @@ ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpe add_child (new_config); - peak_reader->add_output (tmp_file); + if (use_loudness) { + loudness_reader->add_output (tmp_file); + } else { + peak_reader->add_output (tmp_file); + } } ExportGraphBuilder::FloatSinkPtr ExportGraphBuilder::Normalizer::sink () { + if (use_loudness) { + return loudness_reader; + } return peak_reader; } @@ -365,11 +470,28 @@ ExportGraphBuilder::Normalizer::add_child (FileSpec const & new_config) threader->add_output (children.back().sink()); } +void +ExportGraphBuilder::Normalizer::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator iter = children.begin (); + + while (iter != children.end() ) { + iter->remove_children (remove_out_files); + iter = children.erase (iter); + } +} + bool ExportGraphBuilder::Normalizer::operator== (FileSpec const & other_config) const { return config.format->normalize() == other_config.format->normalize() && - config.format->normalize_target() == other_config.format->normalize_target(); + config.format->normalize_loudness () == other_config.format->normalize_loudness() && + ( + (!config.format->normalize_loudness () && config.format->normalize_dbfs() == other_config.format->normalize_dbfs()) + || + // FIXME: allow simultaneous export of two formats with different loundness normalization settings + (config.format->normalize_loudness () /* lufs/dbtp is a result option, not an instantaion option */) + ); } unsigned @@ -389,7 +511,15 @@ ExportGraphBuilder::Normalizer::process() void ExportGraphBuilder::Normalizer::start_post_processing() { - normalizer->set_peak (peak_reader->get_peak()); + float gain; + if (use_loudness) { + gain = normalizer->set_peak (loudness_reader->get_peak (config.format->normalize_lufs (), config.format->normalize_dbtp ())); + } else { + gain = normalizer->set_peak (peak_reader->get_peak()); + } + for (boost::ptr_list::iterator i = children.begin(); i != children.end(); ++i) { + (*i).set_peak (gain); + } tmp_file->seek (0, SEEK_SET); tmp_file->add_output (normalizer); parent.normalizers.push_back (this); @@ -398,7 +528,7 @@ ExportGraphBuilder::Normalizer::start_post_processing() /* SRC */ ExportGraphBuilder::SRC::SRC (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) - : parent (parent) + : parent (parent) { config = new_config; converter.reset (new SampleRateConverter (new_config.channel_config->get_n_chans())); @@ -425,6 +555,27 @@ ExportGraphBuilder::SRC::add_child (FileSpec const & new_config) } } +void +ExportGraphBuilder::SRC::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator sfc_iter = children.begin(); + + while (sfc_iter != children.end() ) { + converter->remove_output (sfc_iter->sink() ); + sfc_iter->remove_children (remove_out_files); + sfc_iter = children.erase (sfc_iter); + } + + boost::ptr_list::iterator norm_iter = normalized_children.begin(); + + while (norm_iter != normalized_children.end() ) { + converter->remove_output (norm_iter->sink() ); + norm_iter->remove_children (remove_out_files); + norm_iter = normalized_children.erase (norm_iter); + } + +} + template void ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, boost::ptr_list & list) @@ -448,13 +599,18 @@ ExportGraphBuilder::SRC::operator== (FileSpec const & other_config) const /* SilenceHandler */ ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) - : parent (parent) + : parent (parent) { config = new_config; max_frames_in = max_frames; framecnt_t sample_rate = parent.session.nominal_frame_rate(); - silence_trimmer.reset (new SilenceTrimmer(max_frames_in)); +#ifdef MIXBUS + silence_trimmer.reset (new SilenceTrimmer(max_frames_in, -90)); +#else + // TODO silence-threshold should be per export-preset, with Config->get_silence_threshold being the default + silence_trimmer.reset (new SilenceTrimmer(max_frames_in, Config->get_export_silence_threshold ())); +#endif silence_trimmer->set_trim_beginning (config.format->trim_beginning()); silence_trimmer->set_trim_end (config.format->trim_end()); @@ -487,34 +643,48 @@ ExportGraphBuilder::SilenceHandler::add_child (FileSpec const & new_config) silence_trimmer->add_output (children.back().sink()); } +void +ExportGraphBuilder::SilenceHandler::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator iter = children.begin(); + + while (iter != children.end() ) { + silence_trimmer->remove_output (iter->sink() ); + iter->remove_children (remove_out_files); + iter = children.erase (iter); + } +} + bool ExportGraphBuilder::SilenceHandler::operator== (FileSpec const & other_config) const { ExportFormatSpecification & format = *config.format; ExportFormatSpecification & other_format = *other_config.format; return (format.trim_beginning() == other_format.trim_beginning()) && - (format.trim_end() == other_format.trim_end()) && - (format.silence_beginning_time() == other_format.silence_beginning_time()) && - (format.silence_end_time() == other_format.silence_end_time()); + (format.trim_end() == other_format.trim_end()) && + (format.silence_beginning_time() == other_format.silence_beginning_time()) && + (format.silence_end_time() == other_format.silence_end_time()); } /* ChannelConfig */ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, FileSpec const & new_config, ChannelMap & channel_map) - : parent (parent) + : parent (parent) { typedef ExportChannelConfiguration::ChannelList ChannelList; config = new_config; - framecnt_t max_frames = parent.session.engine().frames_per_cycle(); + framecnt_t max_frames = parent.session.engine().samples_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; + if (chan_count > 0) { + max_frames_out -= max_frames_out % chan_count; + } chunker.reset (new Chunker (max_frames_out)); interleaver->add_output(chunker); @@ -550,6 +720,19 @@ ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config) chunker->add_output (children.back().sink ()); } +void +ExportGraphBuilder::ChannelConfig::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator iter = children.begin(); + + while(iter != children.end() ) { + + chunker->remove_output (iter->sink ()); + iter->remove_children (remove_out_files); + iter = children.erase(iter); + } +} + bool ExportGraphBuilder::ChannelConfig::operator== (FileSpec const & other_config) const {