X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fexport_graph_builder.h;h=c9671d729bbb6388a9821a6a01ae640a9e2b7a81;hb=8c944c08eacf8372fc714c9c00257ec13a263ae8;hp=40960b2b389300f0a199a75dbee055202856337e;hpb=2ba58dfe65bb0c5ba7d5eb18a1566fa79eeb6993;p=ardour.git diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h index 40960b2b38..c9671d729b 100644 --- a/libs/ardour/ardour/export_graph_builder.h +++ b/libs/ardour/ardour/export_graph_builder.h @@ -22,6 +22,7 @@ #define __ardour_export_graph_builder_h__ #include "ardour/export_handler.h" +#include "ardour/export_analysis.h" #include "audiographer/utils/identity_vertex.h" @@ -31,7 +32,9 @@ namespace AudioGrapher { class SampleRateConverter; class PeakReader; + class LoudnessReader; class Normalizer; + class Analyser; template class Chunker; template class SampleFormatConverter; template class Interleaver; @@ -55,7 +58,9 @@ class LIBARDOUR_API ExportGraphBuilder typedef boost::shared_ptr > FloatSinkPtr; typedef boost::shared_ptr > IdentityVertexPtr; + typedef boost::shared_ptr AnalysisPtr; typedef std::map ChannelMap; + typedef std::map AnalysisMap; public: @@ -63,27 +68,36 @@ class LIBARDOUR_API ExportGraphBuilder ~ExportGraphBuilder (); int process (framecnt_t frames, bool last_cycle); - bool process_normalize (); // returns true when finished - bool will_normalize() { return !normalizers.empty(); } - unsigned get_normalize_cycle_count() const; + bool post_process (); // returns true when finished + bool need_postprocessing () const { return !intermediates.empty(); } + bool realtime() const { return _realtime; } + unsigned get_postprocessing_cycle_count() const; void reset (); + void cleanup (bool remove_out_files = false); void set_current_timespan (boost::shared_ptr span); - void add_config (FileSpec const & config); + void add_config (FileSpec const & config, bool rt); + void get_analysis_results (AnalysisResults& results); private: + void add_analyser (const std::string& fn, AnalysisPtr ap) { + analysis_map.insert (std::make_pair (fn, ap)); + } + void add_split_config (FileSpec const & config); class Encoder { - public: + public: template boost::shared_ptr > init (FileSpec const & new_config); void add_child (FileSpec const & new_config); + void remove_children (); + void destroy_writer (bool delete_out_file); bool operator== (FileSpec const & other_config) const; static int get_real_format (FileSpec const & config); - private: + private: typedef boost::shared_ptr > FloatWriterPtr; typedef boost::shared_ptr > IntWriterPtr; typedef boost::shared_ptr > ShortWriterPtr; @@ -95,6 +109,8 @@ class LIBARDOUR_API ExportGraphBuilder std::list filenames; PBD::ScopedConnection copy_files_connection; + std::string writer_filename; + // Only one of these should be available at a time FloatWriterPtr float_writer; IntWriterPtr int_writer; @@ -103,14 +119,17 @@ class LIBARDOUR_API ExportGraphBuilder // sample format converter class SFC { - public: + public: // This constructor so that this can be constructed like a Normalizer SFC (ExportGraphBuilder &, FileSpec const & new_config, framecnt_t max_frames); FloatSinkPtr sink (); void add_child (FileSpec const & new_config); + void remove_children (bool remove_out_files); bool operator== (FileSpec const & other_config) const; + void set_peak (float); - private: + private: + typedef boost::shared_ptr > ChunkerPtr; typedef boost::shared_ptr > FloatConverterPtr; typedef boost::shared_ptr > IntConverterPtr; typedef boost::shared_ptr > ShortConverterPtr; @@ -119,57 +138,67 @@ class LIBARDOUR_API ExportGraphBuilder boost::ptr_list children; int data_width; + ChunkerPtr chunker; + AnalysisPtr analyser; + bool _analyse; // Only one of these should be available at a time FloatConverterPtr float_converter; IntConverterPtr int_converter; ShortConverterPtr short_converter; }; - class Normalizer { - public: - Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames); + class Intermediate { + public: + Intermediate (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames); FloatSinkPtr sink (); void add_child (FileSpec const & new_config); + void remove_children (bool remove_out_files); bool operator== (FileSpec const & other_config) const; - unsigned get_normalize_cycle_count() const; + unsigned get_postprocessing_cycle_count() const; /// Returns true when finished bool process (); - private: + private: typedef boost::shared_ptr PeakReaderPtr; + typedef boost::shared_ptr LoudnessReaderPtr; typedef boost::shared_ptr NormalizerPtr; typedef boost::shared_ptr > TmpFilePtr; typedef boost::shared_ptr > ThreaderPtr; typedef boost::shared_ptr > BufferPtr; - void start_post_processing(); + void prepare_post_processing (); + void start_post_processing (); ExportGraphBuilder & parent; FileSpec config; framecnt_t max_frames_out; - + bool use_loudness; + bool use_peak; BufferPtr buffer; PeakReaderPtr peak_reader; TmpFilePtr tmp_file; NormalizerPtr normalizer; ThreaderPtr threader; + LoudnessReaderPtr loudness_reader; boost::ptr_list children; - PBD::ScopedConnection post_processing_connection; + PBD::ScopedConnectionList post_processing_connection; }; // sample rate converter class SRC { - public: + public: SRC (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames); FloatSinkPtr sink (); void add_child (FileSpec const & new_config); + void remove_children (bool remove_out_files); + bool operator== (FileSpec const & other_config) const; - private: + private: typedef boost::shared_ptr SRConverterPtr; template @@ -178,20 +207,21 @@ class LIBARDOUR_API ExportGraphBuilder ExportGraphBuilder & parent; FileSpec config; boost::ptr_list children; - boost::ptr_list normalized_children; + boost::ptr_list intermediate_children; SRConverterPtr converter; framecnt_t max_frames_out; }; // Silence trimmer + adder class SilenceHandler { - public: + public: SilenceHandler (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames); FloatSinkPtr sink (); void add_child (FileSpec const & new_config); + void remove_children (bool remove_out_files); bool operator== (FileSpec const & other_config) const; - private: + private: typedef boost::shared_ptr > SilenceTrimmerPtr; ExportGraphBuilder & parent; @@ -203,12 +233,13 @@ class LIBARDOUR_API ExportGraphBuilder // channel configuration class ChannelConfig { - public: + public: ChannelConfig (ExportGraphBuilder & parent, FileSpec const & new_config, ChannelMap & channel_map); void add_child (FileSpec const & new_config); + void remove_children (bool remove_out_files); bool operator== (FileSpec const & other_config) const; - private: + private: typedef boost::shared_ptr > InterleaverPtr; typedef boost::shared_ptr > ChunkerPtr; @@ -232,7 +263,11 @@ class LIBARDOUR_API ExportGraphBuilder framecnt_t process_buffer_frames; - std::list normalizers; + std::list intermediates; + + AnalysisMap analysis_map; + + bool _realtime; Glib::ThreadPool thread_pool; };