#include "ardour/export_channel_configuration.h"
#include "ardour/export_filename.h"
#include "ardour/export_format_specification.h"
+#include "ardour/export_timespan.h"
#include "ardour/sndfile_helpers.h"
#include "pbd/filesystem.h"
using namespace AudioGrapher;
+using std::string;
namespace ARDOUR {
}
int
-ExportGraphBuilder::process (nframes_t /* frames */, bool last_cycle)
+ExportGraphBuilder::process (framecnt_t frames, bool last_cycle)
{
+ assert(frames <= process_buffer_frames);
+
for (ChannelMap::iterator it = channels.begin(); it != channels.end(); ++it) {
- it->first->read (process_buffer, process_buffer_frames);
- ProcessContext<Sample> context(process_buffer, process_buffer_frames, 1);
+ it->first->read (process_buffer, frames);
+ ProcessContext<Sample> context(process_buffer, frames, 1);
if (last_cycle) { context.set_flag (ProcessContext<Sample>::EndOfInput); }
it->second->process (context);
}
void
ExportGraphBuilder::reset ()
{
+ timespan.reset();
channel_configs.clear ();
channels.clear ();
normalizers.clear ();
}
+void
+ExportGraphBuilder::set_current_timespan (boost::shared_ptr<ExportTimespan> span)
+{
+ timespan = span;
+}
+
void
ExportGraphBuilder::add_config (FileSpec const & config)
{
- if (!config.channel_config->get_split ()) {
- add_split_config (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));
+ 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;
}
// each corresponding to a file, at this stage
typedef std::list<boost::shared_ptr<ExportChannelConfiguration> > ConfigList;
ConfigList file_configs;
- config.channel_config->configurations_for_files (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 = config;
+ FileSpec copy = new_config;
copy.channel_config = *it;
copy.filename.reset (new ExportFilename (*copy.filename));
}
// No duplicate channel config found, create new one
- channel_configs.push_back (ChannelConfig (*this));
- ChannelConfig & c_config (channel_configs.back());
- c_config.init (config, channels);
+ channel_configs.push_back (new ChannelConfig (*this, config, channels));
}
/* Encoder */
{
unsigned channels = config.channel_config->get_n_chans();
int format = get_real_format (config);
- Glib::ustring filename = config.filename->get_path (config.format);
+ 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()));
- writer->FileWritten.connect (sigc::mem_fun (*this, &ExportGraphBuilder::Encoder::copy_files));
+ 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));
}
void
/* SFC */
-ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::SFC::init (FileSpec const & new_config, nframes_t max_frames)
+ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &, FileSpec const & new_config, framecnt_t max_frames)
+ : data_width(0)
{
config = new_config;
data_width = sndfile_data_width (Encoder::get_real_format (config));
short_converter = ShortConverterPtr (new SampleFormatConverter<short> (channels));
short_converter->init (max_frames, config.format->dither_type(), data_width);
add_child (config);
- return 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);
- return 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(), data_width);
+ float_converter->init (max_frames, config.format->dither_type(), actual_data_width);
add_child (config);
+ }
+}
+
+ExportGraphBuilder::FloatSinkPtr
+ExportGraphBuilder::SFC::sink ()
+{
+ if (data_width == 8 || data_width == 16) {
+ return short_converter;
+ } else if (data_width == 24 || data_width == 32) {
+ return int_converter;
+ } else {
return float_converter;
}
}
void
ExportGraphBuilder::SFC::add_child (FileSpec const & new_config)
{
- for (std::list<Encoder>::iterator it = children.begin(); it != children.end(); ++it) {
+ for (boost::ptr_list<Encoder>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- children.push_back (Encoder());
+ children.push_back (new Encoder());
Encoder & encoder = children.back();
if (data_width == 8 || data_width == 16) {
/* Normalizer */
-ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::Normalizer::init (FileSpec const & new_config, nframes_t /*max_frames*/)
+ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t /*max_frames*/)
+ : parent (parent)
{
config = new_config;
max_frames_out = 4086; // TODO good chunk size
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 (sigc::hide (sigc::mem_fun (*this, &Normalizer::start_post_processing)));
+ 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);
+}
+
+ExportGraphBuilder::FloatSinkPtr
+ExportGraphBuilder::Normalizer::sink ()
+{
return peak_reader;
}
void
ExportGraphBuilder::Normalizer::add_child (FileSpec const & new_config)
{
- for (std::list<SFC>::iterator it = children.begin(); it != children.end(); ++it) {
+ for (boost::ptr_list<SFC>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- children.push_back (SFC (parent));
- threader->add_output (children.back().init (new_config, max_frames_out));
+ children.push_back (new SFC (parent, new_config, max_frames_out));
+ threader->add_output (children.back().sink());
}
bool
bool
ExportGraphBuilder::Normalizer::process()
{
- nframes_t frames_read = tmp_file->read (*buffer);
+ framecnt_t frames_read = tmp_file->read (*buffer);
return frames_read != buffer->frames();
}
/* SRC */
-ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::SRC::init (FileSpec const & new_config, nframes_t max_frames)
+ExportGraphBuilder::SRC::SRC (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames)
+ : parent (parent)
{
config = new_config;
converter.reset (new SampleRateConverter (new_config.channel_config->get_n_chans()));
max_frames_out = converter->allocate_buffers (max_frames);
add_child (new_config);
-
+}
+
+ExportGraphBuilder::FloatSinkPtr
+ExportGraphBuilder::SRC::sink ()
+{
return converter;
}
template<typename T>
void
-ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, std::list<T> & list)
+ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, boost::ptr_list<T> & list)
{
- for (typename std::list<T>::iterator it = list.begin(); it != list.end(); ++it) {
+ for (typename boost::ptr_list<T>::iterator it = list.begin(); it != list.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- list.push_back (T (parent));
- converter->add_output (list.back().init (new_config, max_frames_out));
+ list.push_back (new T (parent, new_config, max_frames_out));
+ converter->add_output (list.back().sink ());
}
bool
}
/* SilenceHandler */
-ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::SilenceHandler::init (FileSpec const & new_config, nframes_t max_frames)
+ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames)
+ : parent (parent)
{
config = new_config;
max_frames_in = max_frames;
- nframes_t sample_rate = parent.session.nominal_frame_rate();
+ 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());
- silence_trimmer->add_silence_to_beginning (config.format->silence_beginning(sample_rate));
- silence_trimmer->add_silence_to_end (config.format->silence_end(sample_rate));
- add_child (new_config);
+ 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);
+}
+
+ExportGraphBuilder::FloatSinkPtr
+ExportGraphBuilder::SilenceHandler::sink ()
+{
return silence_trimmer;
}
void
ExportGraphBuilder::SilenceHandler::add_child (FileSpec const & new_config)
{
- for (std::list<SRC>::iterator it = children.begin(); it != children.end(); ++it) {
+ for (boost::ptr_list<SRC>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- children.push_back (SRC (parent));
- silence_trimmer->add_output (children.back().init (new_config, max_frames_in));
+ children.push_back (new SRC (parent, new_config, max_frames_in));
+ silence_trimmer->add_output (children.back().sink());
}
bool
ExportFormatSpecification & other_format = *other_config.format;
return (format.trim_beginning() == other_format.trim_beginning()) &&
(format.trim_end() == other_format.trim_end()) &&
- (format.silence_beginning() == other_format.silence_beginning()) &&
- (format.silence_end() == other_format.silence_end());
+ (format.silence_beginning_time() == other_format.silence_beginning_time()) &&
+ (format.silence_end_time() == other_format.silence_end_time());
}
/* ChannelConfig */
-void
-ExportGraphBuilder::ChannelConfig::init (FileSpec const & new_config, ChannelMap & channel_map)
+ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, FileSpec const & new_config, ChannelMap & channel_map)
+ : parent (parent)
{
typedef ExportChannelConfiguration::ChannelList ChannelList;
void
ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config)
{
- for (std::list<SilenceHandler>::iterator it = children.begin(); it != children.end(); ++it) {
+ for (boost::ptr_list<SilenceHandler>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- children.push_back (SilenceHandler (parent));
- nframes_t max_frames_out = new_config.channel_config->get_n_chans() * max_frames;
- interleaver->add_output (children.back().init (new_config, max_frames_out));
+ 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 ());
}
bool
projects / ardour.git / blobdiff