X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_graph_builder.cc;h=afcfd2ee5dd6ff3e6e45eb5d26382f0df009afe6;hb=00803ca69b2d808b1e4f88429fff16acd09a7271;hp=27b2f6948e735c402f56a18fc9699f0e2efd4e10;hpb=f34722bf49a210f8628caf91a6feb034679fc86b;p=ardour.git diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index 27b2f6948e..afcfd2ee5d 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -36,6 +36,8 @@ #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/tmp_file_sync.h" #include "audiographer/sndfile/sndfile_writer.h" #include "ardour/audioengine.h" @@ -82,25 +84,25 @@ ExportGraphBuilder::process (framecnt_t frames, bool last_cycle) } bool -ExportGraphBuilder::process_normalize () +ExportGraphBuilder::post_process () { - for (std::list::iterator it = normalizers.begin(); it != normalizers.end(); /* ++ in loop */) { + for (std::list::iterator it = intermediates.begin(); it != intermediates.end(); /* ++ in loop */) { if ((*it)->process()) { - it = normalizers.erase (it); + it = intermediates.erase (it); } else { ++it; } } - return normalizers.empty(); + return intermediates.empty(); } unsigned -ExportGraphBuilder::get_normalize_cycle_count() const +ExportGraphBuilder::get_postprocessing_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()); + for (std::list::const_iterator it = intermediates.begin(); it != intermediates.end(); ++it) { + max = std::max(max, (*it)->get_postprocessing_cycle_count()); } return max; } @@ -111,8 +113,9 @@ ExportGraphBuilder::reset () timespan.reset(); channel_configs.clear (); channels.clear (); - normalizers.clear (); + intermediates.clear (); analysis_map.clear(); + _realtime = false; } void @@ -133,7 +136,7 @@ ExportGraphBuilder::set_current_timespan (boost::shared_ptr span } void -ExportGraphBuilder::add_config (FileSpec const & config) +ExportGraphBuilder::add_config (FileSpec const & config, bool rt) { ExportChannelConfiguration::ChannelList const & channels = config.channel_config->get_channels(); @@ -142,6 +145,8 @@ ExportGraphBuilder::add_config (FileSpec const & config) (*it)->set_max_buffer_size(process_buffer_frames); } + _realtime = rt; + // 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); @@ -317,6 +322,8 @@ ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &parent, FileSpec const & new_c 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); } @@ -404,11 +411,12 @@ ExportGraphBuilder::SFC::operator== (FileSpec const & other_config) const return config.format->sample_format() == other_config.format->sample_format(); } -/* Normalizer */ +/* Intermediate (Normalizer, TmpFile) */ -ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) +ExportGraphBuilder::Intermediate::Intermediate (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) : parent (parent) , use_loudness (false) + , use_peak (false) { std::string tmpfile_path = parent.session.session_directory().export_path(); tmpfile_path = Glib::build_filename(tmpfile_path, "XXXXXX"); @@ -420,41 +428,57 @@ ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpe 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 (); + use_peak = config.format->normalize (); buffer.reset (new AllocatingProcessContext (max_frames_out, channels)); - peak_reader.reset (new PeakReader ()); - loudness_reader.reset (new LoudnessReader (config.format->sample_rate(), channels, max_frames)); + + if (use_peak) { + peak_reader.reset (new PeakReader ()); + } + if (use_loudness) { + 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); normalizer->add_output (threader); int format = ExportFormatBase::F_RAW | ExportFormatBase::SF_Float; - tmp_file.reset (new TmpFile (&tmpfile_path_buf[0], format, channels, config.format->sample_rate())); + + if (parent._realtime) { + tmp_file.reset (new TmpFileRt (&tmpfile_path_buf[0], format, channels, config.format->sample_rate())); + } else { + tmp_file.reset (new TmpFileSync (&tmpfile_path_buf[0], format, channels, config.format->sample_rate())); + } + tmp_file->FileWritten.connect_same_thread (post_processing_connection, - boost::bind (&Normalizer::start_post_processing, this)); + boost::bind (&Intermediate::prepare_post_processing, this)); + tmp_file->FileFlushed.connect_same_thread (post_processing_connection, + boost::bind (&Intermediate::start_post_processing, this)); add_child (new_config); if (use_loudness) { loudness_reader->add_output (tmp_file); - } else { + } else if (use_peak) { peak_reader->add_output (tmp_file); } } ExportGraphBuilder::FloatSinkPtr -ExportGraphBuilder::Normalizer::sink () +ExportGraphBuilder::Intermediate::sink () { if (use_loudness) { return loudness_reader; + } else if (use_peak) { + return peak_reader; } - return peak_reader; + return tmp_file; } void -ExportGraphBuilder::Normalizer::add_child (FileSpec const & new_config) +ExportGraphBuilder::Intermediate::add_child (FileSpec const & new_config) { for (boost::ptr_list::iterator it = children.begin(); it != children.end(); ++it) { if (*it == new_config) { @@ -468,7 +492,7 @@ ExportGraphBuilder::Normalizer::add_child (FileSpec const & new_config) } void -ExportGraphBuilder::Normalizer::remove_children (bool remove_out_files) +ExportGraphBuilder::Intermediate::remove_children (bool remove_out_files) { boost::ptr_list::iterator iter = children.begin (); @@ -479,7 +503,7 @@ ExportGraphBuilder::Normalizer::remove_children (bool remove_out_files) } bool -ExportGraphBuilder::Normalizer::operator== (FileSpec const & other_config) const +ExportGraphBuilder::Intermediate::operator== (FileSpec const & other_config) const { return config.format->normalize() == other_config.format->normalize() && config.format->normalize_loudness () == other_config.format->normalize_loudness() && @@ -492,34 +516,49 @@ ExportGraphBuilder::Normalizer::operator== (FileSpec const & other_config) const } unsigned -ExportGraphBuilder::Normalizer::get_normalize_cycle_count() const +ExportGraphBuilder::Intermediate::get_postprocessing_cycle_count() const { return static_cast(std::ceil(static_cast(tmp_file->get_frames_written()) / max_frames_out)); } bool -ExportGraphBuilder::Normalizer::process() +ExportGraphBuilder::Intermediate::process() { framecnt_t frames_read = tmp_file->read (*buffer); return frames_read != buffer->frames(); } void -ExportGraphBuilder::Normalizer::start_post_processing() +ExportGraphBuilder::Intermediate::prepare_post_processing() { + // called in sync rt-context float gain; if (use_loudness) { gain = normalizer->set_peak (loudness_reader->get_peak (config.format->normalize_lufs (), config.format->normalize_dbtp ())); - } else { + } else if (use_peak) { gain = normalizer->set_peak (peak_reader->get_peak()); + } else { + gain = normalizer->set_peak (0.0); } - for (boost::ptr_list::iterator i = children.begin(); i != children.end(); ++i) { - (*i).set_peak (gain); + if (use_loudness || use_peak) { + // push info to analyzers + 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); + parent.intermediates.push_back (this); +} + +void +ExportGraphBuilder::Intermediate::start_post_processing() +{ + // called in disk-thread (when exporting in realtime) + tmp_file->seek (0, SEEK_SET); + if (!AudioEngine::instance()->freewheeling ()) { + AudioEngine::instance()->freewheel (true); + } } /* SRC */ @@ -545,8 +584,8 @@ ExportGraphBuilder::SRC::sink () void ExportGraphBuilder::SRC::add_child (FileSpec const & new_config) { - if (new_config.format->normalize()) { - add_child_to_list (new_config, normalized_children); + if (new_config.format->normalize() || parent._realtime) { + add_child_to_list (new_config, intermediate_children); } else { add_child_to_list (new_config, children); } @@ -563,12 +602,12 @@ ExportGraphBuilder::SRC::remove_children (bool remove_out_files) sfc_iter = children.erase (sfc_iter); } - boost::ptr_list::iterator norm_iter = normalized_children.begin(); + boost::ptr_list::iterator norm_iter = intermediate_children.begin(); - while (norm_iter != normalized_children.end() ) { + while (norm_iter != intermediate_children.end() ) { converter->remove_output (norm_iter->sink() ); norm_iter->remove_children (remove_out_files); - norm_iter = normalized_children.erase (norm_iter); + norm_iter = intermediate_children.erase (norm_iter); } } @@ -602,11 +641,17 @@ ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent, max_frames_in = max_frames; framecnt_t sample_rate = parent.session.nominal_frame_rate(); + /* work around partsing "-inf" config to "0" -- 7b1f97b + * silence trim 0dBFS makes no sense, anyway. + */ + float est = Config->get_export_silence_threshold (); + if (est >= 0.f) est = -INFINITY; #ifdef MIXBUS - silence_trimmer.reset (new SilenceTrimmer(max_frames_in, -90)); + // Mixbus channelstrip always dithers the signal, cut above dither level + silence_trimmer.reset (new SilenceTrimmer(max_frames_in, std::max (-90.f, est))); #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 ())); + silence_trimmer.reset (new SilenceTrimmer(max_frames_in, est)); #endif silence_trimmer->set_trim_beginning (config.format->trim_beginning()); silence_trimmer->set_trim_end (config.format->trim_end());