X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fexport_graph_builder.cc;h=9b35e16530dac5c784b152165db8a5f943af067c;hb=02ec346c2b8a8872bfb3b7f231556c0f514ff95f;hp=d0ce88338522dfb657ce361f190f8f02522b8f7f;hpb=ffccaaf0bbd23ea655d8027f5173b45ba3258edf;p=ardour.git diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index d0ce883385..9b35e16530 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -17,8 +17,10 @@ #include "ardour/export_format_specification.h" #include "ardour/export_timespan.h" #include "ardour/sndfile_helpers.h" +#include "ardour/utils.h" #include "pbd/filesystem.h" +#include "pbd/cpus.h" using namespace AudioGrapher; using std::string; @@ -27,7 +29,7 @@ namespace ARDOUR { ExportGraphBuilder::ExportGraphBuilder (Session const & session) : session (session) - , thread_pool (4) // FIXME thread amount to cores amount + , thread_pool (hardware_concurrency()) { process_buffer_frames = session.engine().frames_per_cycle(); } @@ -40,15 +42,15 @@ int ExportGraphBuilder::process (framecnt_t frames, bool last_cycle) { assert(frames <= process_buffer_frames); - + for (ChannelMap::iterator it = channels.begin(); it != channels.end(); ++it) { - Sample * process_buffer = 0; + Sample const * process_buffer = 0; it->first->read (process_buffer, frames); - ProcessContext context(process_buffer, frames, 1); - if (last_cycle) { context.set_flag (ProcessContext::EndOfInput); } + ConstProcessContext context(process_buffer, frames, 1); + if (last_cycle) { context().set_flag (ProcessContext::EndOfInput); } it->second->process (context); } - + return 0; } @@ -62,10 +64,20 @@ ExportGraphBuilder::process_normalize () ++it; } } - + return normalizers.empty(); } +unsigned +ExportGraphBuilder::get_normalize_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()); + } + return max; +} + void ExportGraphBuilder::reset () { @@ -99,28 +111,28 @@ ExportGraphBuilder::add_config (FileSpec const & config) framecnt_t session_rate = session.nominal_frame_rate(); new_config.format->set_sample_rate(ExportFormatBase::nearest_sample_rate(session_rate)); } - - + + if (!new_config.channel_config->get_split ()) { add_split_config (new_config); return; } - + // Split channel configurations are split into several channel configurations, // each corresponding to a file, at this stage typedef std::list > ConfigList; ConfigList file_configs; new_config.channel_config->configurations_for_files (file_configs); - + unsigned chan = 1; for (ConfigList::iterator it = file_configs.begin(); it != file_configs.end(); ++it, ++chan) { FileSpec copy = new_config; copy.channel_config = *it; - + copy.filename.reset (new ExportFilename (*copy.filename)); copy.filename->include_channel = true; copy.filename->set_channel (chan); - + add_split_config (copy); } } @@ -134,7 +146,7 @@ ExportGraphBuilder::add_split_config (FileSpec const & config) return; } } - + // No duplicate channel config found, create new one channel_configs.push_back (new ChannelConfig (*this, config, channels)); } @@ -195,7 +207,7 @@ ExportGraphBuilder::Encoder::init_writer (boost::shared_ptrset_channel_config(config.channel_config); string filename = config.filename->get_path (config.format); - + writer.reset (new AudioGrapher::SndfileWriter (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)); } @@ -204,7 +216,7 @@ void ExportGraphBuilder::Encoder::copy_files (std::string orig_path) { while (filenames.size()) { - FilenamePtr & filename = filenames.front(); + ExportFilenamePtr & filename = filenames.front(); PBD::sys::copy_file (orig_path, filename->get_path (config.format).c_str()); filenames.pop_front(); } @@ -218,7 +230,7 @@ ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &, FileSpec const & new_config, config = new_config; data_width = sndfile_data_width (Encoder::get_real_format (config)); unsigned channels = new_config.channel_config->get_n_chans(); - + if (data_width == 8 || data_width == 16) { short_converter = ShortConverterPtr (new SampleFormatConverter (channels)); short_converter->init (max_frames, config.format->dither_type(), data_width); @@ -256,10 +268,10 @@ ExportGraphBuilder::SFC::add_child (FileSpec const & new_config) return; } } - + children.push_back (new Encoder()); Encoder & encoder = children.back(); - + if (data_width == 8 || data_width == 16) { short_converter->add_output (encoder.init (new_config)); } else if (data_width == 24 || data_width == 32) { @@ -282,22 +294,23 @@ ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpe { config = new_config; max_frames_out = 4086; // TODO good chunk size - + buffer.reset (new AllocatingProcessContext (max_frames_out, config.channel_config->get_n_chans())); peak_reader.reset (new PeakReader ()); normalizer.reset (new AudioGrapher::Normalizer (config.format->normalize_target())); 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 (format, config.channel_config->get_n_chans(), + tmp_file.reset (new TmpFile (format, config.channel_config->get_n_chans(), config.format->sample_rate())); - tmp_file->FileWritten.connect_same_thread (post_processing_connection, boost::bind (&Normalizer::start_post_processing, this)); - + 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); } @@ -316,7 +329,7 @@ ExportGraphBuilder::Normalizer::add_child (FileSpec const & new_config) return; } } - + children.push_back (new SFC (parent, new_config, max_frames_out)); threader->add_output (children.back().sink()); } @@ -328,6 +341,13 @@ ExportGraphBuilder::Normalizer::operator== (FileSpec const & other_config) const config.format->normalize_target() == other_config.format->normalize_target(); } +unsigned +ExportGraphBuilder::Normalizer::get_normalize_cycle_count() const +{ + return static_cast(std::ceil(static_cast(tmp_file->get_frames_written()) / + max_frames_out)); +} + bool ExportGraphBuilder::Normalizer::process() { @@ -354,7 +374,7 @@ ExportGraphBuilder::SRC::SRC (ExportGraphBuilder & parent, FileSpec const & new_ ExportFormatSpecification & format = *new_config.format; converter->init (parent.session.nominal_frame_rate(), format.sample_rate(), format.src_quality()); max_frames_out = converter->allocate_buffers (max_frames); - + add_child (new_config); } @@ -384,7 +404,7 @@ ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, boost:: return; } } - + list.push_back (new T (parent, new_config, max_frames_out)); converter->add_output (list.back().sink ()); } @@ -402,17 +422,17 @@ ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & 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)); silence_trimmer->set_trim_beginning (config.format->trim_beginning()); silence_trimmer->set_trim_end (config.format->trim_end()); - + 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); - + silence_trimmer->add_silence_to_beginning (sb); silence_trimmer->add_silence_to_end (se); - + add_child (new_config); } @@ -431,7 +451,7 @@ ExportGraphBuilder::SilenceHandler::add_child (FileSpec const & new_config) return; } } - + children.push_back (new SRC (parent, new_config, max_frames_in)); silence_trimmer->add_output (children.back().sink()); } @@ -453,13 +473,13 @@ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, F : parent (parent) { typedef ExportChannelConfiguration::ChannelList ChannelList; - + config = new_config; max_frames = parent.session.engine().frames_per_cycle(); - + interleaver.reset (new Interleaver ()); interleaver->init (new_config.channel_config->get_n_chans(), max_frames); - + 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) { @@ -472,7 +492,7 @@ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, F } map_it->second->add_output (interleaver->input (chan)); } - + add_child (new_config); } @@ -485,7 +505,7 @@ ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config) return; } } - + 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 ());