Merge branch 'master' into audioengine
[ardour.git] / libs / ardour / export_graph_builder.cc
index d0ce88338522dfb657ce361f190f8f02522b8f7f..301914b0ae0b6ae70cd0f3a36d6f3f4b8d32a944 100644 (file)
@@ -1,6 +1,29 @@
+/*
+    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 <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/peak_reader.h"
 #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 "pbd/filesystem.h"
+#include "pbd/file_utils.h"
+#include "pbd/cpus.h"
 
 using namespace AudioGrapher;
 using std::string;
@@ -27,9 +52,9 @@ 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();
+       process_buffer_frames = session.engine().samples_per_cycle();
 }
 
 ExportGraphBuilder::~ExportGraphBuilder ()
@@ -40,15 +65,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<Sample> context(process_buffer, frames, 1);
-               if (last_cycle) { context.set_flag (ProcessContext<Sample>::EndOfInput); }
+               ConstProcessContext<Sample> context(process_buffer, frames, 1);
+               if (last_cycle) { context().set_flag (ProcessContext<Sample>::EndOfInput); }
                it->second->process (context);
        }
-       
+
        return 0;
 }
 
@@ -62,10 +87,20 @@ ExportGraphBuilder::process_normalize ()
                        ++it;
                }
        }
-       
+
        return normalizers.empty();
 }
 
+unsigned
+ExportGraphBuilder::get_normalize_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());
+       }
+       return max;
+}
+
 void
 ExportGraphBuilder::reset ()
 {
@@ -94,33 +129,33 @@ 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));
        }
-       
-       
+
+
        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<boost::shared_ptr<ExportChannelConfiguration> > 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 +169,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 +230,7 @@ ExportGraphBuilder::Encoder::init_writer (boost::shared_ptr<AudioGrapher::Sndfil
        int format = get_real_format (config);
        config.filename->set_channel_config(config.channel_config);
        string filename = config.filename->get_path (config.format);
-       
+
        writer.reset (new AudioGrapher::SndfileWriter<T> (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,8 +239,8 @@ void
 ExportGraphBuilder::Encoder::copy_files (std::string orig_path)
 {
        while (filenames.size()) {
-               FilenamePtr & filename = filenames.front();
-               PBD::sys::copy_file (orig_path, filename->get_path (config.format).c_str());
+               ExportFilenamePtr & filename = filenames.front();
+               PBD::copy_file (orig_path, filename->get_path (config.format).c_str());
                filenames.pop_front();
        }
 }
@@ -218,7 +253,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<short> (channels));
                short_converter->init (max_frames, config.format->dither_type(), data_width);
@@ -256,10 +291,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<short> (new_config));
        } else if (data_width == 24 || data_width == 32) {
@@ -280,24 +315,31 @@ ExportGraphBuilder::SFC::operator== (FileSpec const & other_config) const
 ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t /*max_frames*/)
   : parent (parent)
 {
+       std::string tmpfile_path = parent.session.session_directory().export_path();
+       tmpfile_path = Glib::build_filename(tmpfile_path, "XXXXXX");
+       char tmpfile_path_buf[tmpfile_path.size() + 1];
+       std::copy(tmpfile_path.begin(), tmpfile_path.end(), tmpfile_path_buf);
+       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
        
-       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()));
        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->FileWritten.connect_same_thread (post_processing_connection, boost::bind (&Normalizer::start_post_processing, this));
-       
+       tmp_file.reset (new TmpFile<float> (tmpfile_path_buf, 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);
 }
 
@@ -316,7 +358,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 +370,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<unsigned>(std::ceil(static_cast<float>(tmp_file->get_frames_written()) /
+                                              max_frames_out));
+}
+
 bool
 ExportGraphBuilder::Normalizer::process()
 {
@@ -354,7 +403,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 +433,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 +451,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<Sample>(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 +480,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 +502,20 @@ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, F
   : 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;
+       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) {
@@ -472,23 +528,24 @@ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, F
                }
                map_it->second->add_output (interleaver->input (chan));
        }
-       
+
        add_child (new_config);
 }
 
 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);
                        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 ());
+       chunker->add_output (children.back().sink ());
 }
 
 bool