X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_graph_builder.cc;h=d23763a5677fc728b8d31a3b413aad53c71b6b9a;hb=6739b6a1e31f943f039b3c1678190af4fe0f8d16;hp=8ef69f2472eacaa9f0f27bf8fdf3134d14b52784;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git

diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index 8ef69f2472..d23763a567 100644
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -28,6 +28,7 @@
 #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/sample_format_converter.h"
 #include "audiographer/general/sr_converter.h"
@@ -110,6 +111,7 @@ ExportGraphBuilder::reset ()
 	channel_configs.clear ();
 	channels.clear ();
 	normalizers.clear ();
+	analysis_map.clear();
 }
 
 void
@@ -173,6 +175,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)
 {
@@ -287,33 +299,60 @@ ExportGraphBuilder::Encoder::copy_files (std::string orig_path)
 
 /* SFC */
 
-ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &, FileSpec const & new_config, framecnt_t max_frames)
+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;
@@ -378,7 +417,7 @@ 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
-	
+
 	buffer.reset (new AllocatingProcessContext<Sample> (max_frames_out, channels));
 	peak_reader.reset (new PeakReader ());
 	normalizer.reset (new AudioGrapher::Normalizer (config.format->normalize_target()));
@@ -452,7 +491,10 @@ ExportGraphBuilder::Normalizer::process()
 void
 ExportGraphBuilder::Normalizer::start_post_processing()
 {
-	normalizer->set_peak (peak_reader->get_peak());
+	const float 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);
@@ -538,7 +580,8 @@ ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent,
 	max_frames_in = max_frames;
 	framecnt_t sample_rate = parent.session.nominal_frame_rate();
 
-	silence_trimmer.reset (new SilenceTrimmer<Sample>(max_frames_in));
+	// 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 ()));
 	silence_trimmer->set_trim_beginning (config.format->trim_beginning());
 	silence_trimmer->set_trim_end (config.format->trim_end());