Merge branch 'master' into audioengine

[ardour.git] / libs / ardour / export_graph_builder.cc

diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index fbb5d0f98aa8140cdabf038f6d8d86dc29df2951..301914b0ae0b6ae70cd0f3a36d6f3f4b8d32a944 100644 (file)
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -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"
@@ -16,9 +39,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 "pbd/filesystem.h"
+#include "pbd/file_utils.h"
 #include "pbd/cpus.h"
 
 using namespace AudioGrapher;
@@ -30,7 +54,7 @@ ExportGraphBuilder::ExportGraphBuilder (Session const & session)
   : session (session)
   , thread_pool (hardware_concurrency())
 {
-       process_buffer_frames = session.engine().frames_per_cycle();
+       process_buffer_frames = session.engine().samples_per_cycle();
 }
 
 ExportGraphBuilder::~ExportGraphBuilder ()
@@ -105,7 +129,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));
@@ -216,7 +240,7 @@ 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();
        }
 }
@@ -291,6 +315,12 @@ 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;
        uint32_t const channels = config.channel_config->get_n_chans();
        max_frames_out = 4086 - (4086 % channels); // TODO good chunk size
@@ -304,7 +334,7 @@ ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpe
        normalizer->add_output (threader);
 
        int format = ExportFormatBase::F_RAW | ExportFormatBase::SF_Float;
-       tmp_file.reset (new TmpFile<float> (format, channels, config.format->sample_rate()));
+       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));
 
@@ -474,11 +504,18 @@ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, F
        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) {
@@ -498,6 +535,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);
@@ -505,9 +544,8 @@ 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 ());
 }
 
 bool