#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/tmp_file_sync.h"
#include "audiographer/sndfile/sndfile_writer.h"
#include "ardour/audioengine.h"
}
bool
-ExportGraphBuilder::process_normalize ()
+ExportGraphBuilder::post_process ()
{
- for (std::list<Normalizer *>::iterator it = normalizers.begin(); it != normalizers.end(); /* ++ in loop */) {
+ for (std::list<Intermediate *>::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<Normalizer *>::const_iterator it = normalizers.begin(); it != normalizers.end(); ++it) {
- max = std::max(max, (*it)->get_normalize_cycle_count());
+ for (std::list<Intermediate *>::const_iterator it = intermediates.begin(); it != intermediates.end(); ++it) {
+ max = std::max(max, (*it)->get_postprocessing_cycle_count());
}
return max;
}
timespan.reset();
channel_configs.clear ();
channels.clear ();
- normalizers.clear ();
+ intermediates.clear ();
+ analysis_map.clear();
+ _realtime = false;
}
void
}
void
-ExportGraphBuilder::add_config (FileSpec const & config)
+ExportGraphBuilder::add_config (FileSpec const & config, bool rt)
{
ExportChannelConfiguration::ChannelList const & channels =
config.channel_config->get_channels();
(*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);
}
}
+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)
{
/* 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);
+
+ 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<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;
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");
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 ();
+ use_peak = config.format->normalize ();
+
buffer.reset (new AllocatingProcessContext<Sample> (max_frames_out, channels));
- peak_reader.reset (new PeakReader ());
- normalizer.reset (new AudioGrapher::Normalizer (config.format->normalize_target()));
- threader.reset (new Threader<Sample> (parent.thread_pool));
+ 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<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> (&tmpfile_path_buf[0], format, channels, config.format->sample_rate()));
+
+ if (parent._realtime) {
+ tmp_file.reset (new TmpFileRt<float> (&tmpfile_path_buf[0], format, channels, config.format->sample_rate()));
+ } else {
+ tmp_file.reset (new TmpFileSync<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));
+ 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);
- peak_reader->add_output (tmp_file);
+ if (use_loudness) {
+ loudness_reader->add_output (tmp_file);
+ } else if (use_peak) {
+ peak_reader->add_output (tmp_file);
+ }
}
ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::Normalizer::sink ()
+ExportGraphBuilder::Intermediate::sink ()
{
- return peak_reader;
+ if (use_loudness) {
+ return loudness_reader;
+ } else if (use_peak) {
+ 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<SFC>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
}
void
-ExportGraphBuilder::Normalizer::remove_children (bool remove_out_files)
+ExportGraphBuilder::Intermediate::remove_children (bool remove_out_files)
{
boost::ptr_list<SFC>::iterator iter = children.begin ();
}
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_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
-ExportGraphBuilder::Normalizer::get_normalize_cycle_count() const
+ExportGraphBuilder::Intermediate::get_postprocessing_cycle_count() const
{
return static_cast<unsigned>(std::ceil(static_cast<float>(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 if (use_peak) {
+ gain = normalizer->set_peak (peak_reader->get_peak());
+ } else {
+ gain = normalizer->set_peak (0.0);
+ }
+ if (use_loudness || use_peak) {
+ // push info to analyzers
+ for (boost::ptr_list<SFC>::iterator i = children.begin(); i != children.end(); ++i) {
+ (*i).set_peak (gain);
+ }
+ }
+ tmp_file->add_output (normalizer);
+ parent.intermediates.push_back (this);
+}
+
+void
+ExportGraphBuilder::Intermediate::start_post_processing()
{
- normalizer->set_peak (peak_reader->get_peak());
+ // called in disk-thread (when exporting in realtime)
tmp_file->seek (0, SEEK_SET);
- tmp_file->add_output (normalizer);
- parent.normalizers.push_back (this);
+ if (!AudioEngine::instance()->freewheeling ()) {
+ AudioEngine::instance()->freewheel (true);
+ }
}
/* SRC */
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);
}
sfc_iter = children.erase (sfc_iter);
}
- boost::ptr_list<Normalizer>::iterator norm_iter = normalized_children.begin();
+ boost::ptr_list<Intermediate>::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);
}
}
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());
projects / ardour.git / blobdiff