X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_graph_builder.cc;h=27b2f6948e735c402f56a18fc9699f0e2efd4e10;hb=4bdbe77414b956e27f2c1631e67189c70409a3d1;hp=9b35e16530dac5c784b152165db8a5f943af067c;hpb=f57da9b00e0660640c7a4cbb48f32ef63830d463;p=ardour.git

diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index 9b35e16530..27b2f6948e 100644
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -1,9 +1,36 @@
+/*
+  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 <vector>
+
+#include <glibmm/miscutils.h>
+
 #include "audiographer/process_context.h"
+#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"
@@ -16,10 +43,10 @@
 #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 "ardour/utils.h"
 
-#include "pbd/filesystem.h"
+#include "pbd/file_utils.h"
 #include "pbd/cpus.h"
 
 using namespace AudioGrapher;
@@ -28,10 +55,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 ()
@@ -85,6 +112,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
@@ -106,7 +145,7 @@ ExportGraphBuilder::add_config (FileSpec const & config)
 	// 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));
+	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));
@@ -137,6 +176,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)
 {
@@ -186,6 +235,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
 {
@@ -206,9 +282,9 @@ ExportGraphBuilder::Encoder::init_writer (boost::shared_ptr<AudioGrapher::Sndfil
 	unsigned channels = config.channel_config->get_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<T> (filename, format, channels, config.format->sample_rate(), config.broadcast_info));
+	writer.reset (new AudioGrapher::SndfileWriter<T> (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));
 }
 
@@ -217,40 +293,67 @@ ExportGraphBuilder::Encoder::copy_files (std::string orig_path)
 {
 	while (filenames.size()) {
 		ExportFilenamePtr & filename = filenames.front();
-		PBD::sys::copy_file (orig_path, filename->get_path (config.format).c_str());
+		PBD::copy_file (orig_path, filename->get_path (config.format).c_str());
 		filenames.pop_front();
 	}
 }
 
 /* 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<Sample> (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);
+		parent.add_analyser (config.filename->get_path (config.format), analyser);
+	}
 
 	if (data_width == 8 || data_width == 16) {
 		short_converter = ShortConverterPtr (new SampleFormatConverter<short> (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<int> (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<Sample> (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;
@@ -281,6 +384,20 @@ ExportGraphBuilder::SFC::add_child (FileSpec const & new_config)
 	}
 }
 
+void
+ExportGraphBuilder::SFC::remove_children (bool remove_out_files)
+{
+	boost::ptr_list<Encoder>::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
 {
@@ -289,34 +406,50 @@ 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");
+	std::vector<char> tmpfile_path_buf(tmpfile_path.size() + 1);
+	std::copy(tmpfile_path.begin(), tmpfile_path.end(), tmpfile_path_buf.begin());
+	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
+	use_loudness = config.format->normalize_loudness ();
 
-	buffer.reset (new AllocatingProcessContext<Sample> (max_frames_out, config.channel_config->get_n_chans()));
+	buffer.reset (new AllocatingProcessContext<Sample> (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<Sample> (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<float> (format, config.channel_config->get_n_chans(),
-	                                    config.format->sample_rate()));
+	tmp_file.reset (new TmpFile<float> (&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));
 
 	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;
 }
 
@@ -334,11 +467,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<SFC>::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
@@ -358,7 +508,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<SFC>::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);
@@ -367,7 +525,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()));
@@ -394,6 +552,27 @@ ExportGraphBuilder::SRC::add_child (FileSpec const & new_config)
 	}
 }
 
+void
+ExportGraphBuilder::SRC::remove_children (bool remove_out_files)
+{
+	boost::ptr_list<SFC>::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<Normalizer>::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<typename T>
 void
 ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, boost::ptr_list<T> & list)
@@ -417,13 +596,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<Sample>(max_frames_in));
+#ifdef MIXBUS
+	silence_trimmer.reset (new SilenceTrimmer<Sample>(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<Sample>(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());
 
@@ -456,30 +640,51 @@ 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<SRC>::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;
-	max_frames = parent.session.engine().frames_per_cycle();
 
+	framecnt_t max_frames = parent.session.engine().samples_per_cycle();
 	interleaver.reset (new Interleaver<Sample> ());
 	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;
+	if (chan_count > 0) {
+		max_frames_out -= max_frames_out % chan_count;
+	}
+	chunker.reset (new Chunker<Sample> (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) {
@@ -499,6 +704,8 @@ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, F
 void
 ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config)
 {
+	assert (*this == new_config);
+
 	for (boost::ptr_list<SilenceHandler>::iterator it = children.begin(); it != children.end(); ++it) {
 		if (*it == new_config) {
 			it->add_child (new_config);
@@ -506,9 +713,21 @@ ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config)
 		}
 	}
 
-	framecnt_t const max_frames_out = new_config.channel_config->get_n_chans() * max_frames;
 	children.push_back (new SilenceHandler (parent, new_config, max_frames_out));
-	interleaver->add_output (children.back().sink ());
+	chunker->add_output (children.back().sink ());
+}
+
+void
+ExportGraphBuilder::ChannelConfig::remove_children (bool remove_out_files)
+{
+	boost::ptr_list<SilenceHandler>::iterator iter = children.begin();
+
+	while(iter != children.end() ) {
+
+		chunker->remove_output (iter->sink ());
+		iter->remove_children (remove_out_files);
+		iter = children.erase(iter);
+	}
 }
 
 bool