Implement FFMPEG/MP3 export-format spec and profile

diff --git a/libs/ardour/ardour/export_format_manager.h b/libs/ardour/ardour/export_format_manager.h
index 5a78708efbb58bf252a79e6f9ba5f3fc11591f67..d25e8657a17cc73a7eebd07ff51b6d3e31252594 100644 (file)
--- a/libs/ardour/ardour/export_format_manager.h
+++ b/libs/ardour/ardour/export_format_manager.h
@@ -104,6 +104,7 @@ class LIBARDOUR_API ExportFormatManager : public PBD::ScopedConnectionList
        void select_upload (bool);
        void set_command (std::string);
        void select_src_quality (ExportFormatBase::SRCQuality value);
+       void select_codec_quality (int);
        void select_trim_beginning (bool value);
        void select_silence_beginning (AnyTime const & time);
        void select_trim_end (bool value);

diff --git a/libs/ardour/ardour/export_formats.h b/libs/ardour/ardour/export_formats.h
index 8e51827b89be2f04028cc0ce1608463515d22f44..b8ce3db96af7486fafcce0587702c2eb58b1c57a 100644 (file)
--- a/libs/ardour/ardour/export_formats.h
+++ b/libs/ardour/ardour/export_formats.h
@@ -52,6 +52,8 @@ class LIBARDOUR_API ExportFormat : public ExportFormatBase, public ExportFormatB
        Quality get_quality () const { return *qualities.begin(); }
 
        bool has_sample_format ();
+       bool has_codec_quality ();
+
        bool sample_format_is_compatible (SampleFormat format) const;
 
        /* If the format has a specific sample format, this function should be overridden
@@ -76,6 +78,7 @@ class LIBARDOUR_API ExportFormat : public ExportFormatBase, public ExportFormatB
 
        virtual bool has_broadcast_info () const { return false; }
 
+
   protected:
 
        void add_sample_rate (SampleRate rate) { sample_rates.insert (rate); }
@@ -85,6 +88,36 @@ class LIBARDOUR_API ExportFormat : public ExportFormatBase, public ExportFormatB
        void set_quality (Quality value) { qualities.clear(); qualities.insert (value); }
 };
 
+class LIBARDOUR_API HasCodecQuality : public PBD::ScopedConnectionList {
+public:
+       struct CodecQuality {
+               CodecQuality (std::string const& n, int q)
+                       : name (n)
+                       , quality (q)
+               {}
+
+               std::string name;
+               int         quality;
+       };
+
+       typedef boost::shared_ptr<CodecQuality> CodecQualityPtr;
+       typedef std::list<CodecQualityPtr> CodecQualityList;
+
+       virtual ~HasCodecQuality () {}
+
+       void add_codec_quality (std::string const& name, int q) {
+               CodecQualityPtr ptr (new CodecQuality (name, q));
+               _codec_qualties.push_back (ptr);
+       }
+
+       CodecQualityList const & get_codec_qualities () const {
+               return _codec_qualties;
+       }
+
+protected:
+       CodecQualityList _codec_qualties;
+};
+
 /// Class to be inherited by export formats that have a selectable sample format
 class LIBARDOUR_API HasSampleFormat : public PBD::ScopedConnectionList {
   public:
@@ -211,7 +244,7 @@ class LIBARDOUR_API ExportFormatBWF : public ExportFormat, public HasSampleForma
 };
 
 
-class LIBARDOUR_API ExportFormatFFMPEG : public ExportFormat {
+class LIBARDOUR_API ExportFormatFFMPEG : public ExportFormat, public HasCodecQuality {
   public:
        ExportFormatFFMPEG (std::string const& name, std::string const& ext);
        ~ExportFormatFFMPEG () {};

diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc
index 3581fb890e28821692ef11180eef4981a7ead6a6..fd1b8ac06f34cd32b7b4bee76b07db2915308071 100644 (file)
--- a/libs/ardour/export_format_manager.cc
+++ b/libs/ardour/export_format_manager.cc
@@ -287,6 +287,13 @@ ExportFormatManager::select_src_quality (ExportFormatBase::SRCQuality value)
        check_for_description_change ();
 }
 
+void
+ExportFormatManager::select_codec_quality (int value)
+{
+       current_selection->set_codec_quality (value);
+       check_for_description_change ();
+}
+
 void
 ExportFormatManager::select_with_cue (bool value)
 {

diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc
index 17ce59933dc96631624e97ba51152331f2dcf4eb..ec0b6de1e766f740db9f4aa388bed9be8311e3dd 100644 (file)
--- a/libs/ardour/export_format_specification.cc
+++ b/libs/ardour/export_format_specification.cc
@@ -156,7 +156,7 @@ ExportFormatSpecification::ExportFormatSpecification (Session & s)
        , _soundcloud_upload (false)
        , _command ("")
        , _analyse (true)
-       , _codec_quality (-3)
+       , _codec_quality (-2)
 {
        format_ids.insert (F_None);
        endiannesses.insert (E_FileDefault);
@@ -192,7 +192,7 @@ ExportFormatSpecification::ExportFormatSpecification (Session & s, XMLNode const
        , _soundcloud_upload (false)
        , _command ("")
        , _analyse (true)
-       , _codec_quality (-3)
+       , _codec_quality (-2)
 {
        _silence_beginning.type = Time::Timecode;
        _silence_end.type = Time::Timecode;

diff --git a/libs/ardour/export_formats.cc b/libs/ardour/export_formats.cc
index 0ab02046c3f89b6495dacca73adb584ad92ae871..2539502f92b8bfffee923c83f63d2ece8e7af3e6 100644 (file)
--- a/libs/ardour/export_formats.cc
+++ b/libs/ardour/export_formats.cc
@@ -33,6 +33,13 @@ ExportFormat::has_sample_format ()
        return dynamic_cast<HasSampleFormat *> (this);
 }
 
+bool
+ExportFormat::has_codec_quality ()
+{
+       return dynamic_cast<HasCodecQuality *> (this);
+}
+
+
 bool
 ExportFormat::sample_format_is_compatible (SampleFormat format) const
 {
@@ -374,17 +381,33 @@ ExportFormatFFMPEG::ExportFormatFFMPEG (std::string const& name, std::string con
        set_format_id (F_FFMPEG);
        sample_formats.insert (SF_Float);
 
+       add_sample_rate (SR_8);
        add_sample_rate (SR_22_05);
        add_sample_rate (SR_44_1);
        add_sample_rate (SR_48);
-       add_sample_rate (SR_88_2);
-       add_sample_rate (SR_96);
-       add_sample_rate (SR_176_4);
-       add_sample_rate (SR_192);
        add_sample_rate (SR_Session);
 
        add_endianness (E_Little);
 
+       add_codec_quality ("VBR 220-260 kb/s",  0);
+       add_codec_quality ("VBR 190-250 kb/s", -1);
+       add_codec_quality ("VBR 170-210 kb/s", -2);
+       add_codec_quality ("VBR 150-195 kb/s", -3);
+       add_codec_quality ("VBR 140-185 kb/s", -4);
+       add_codec_quality ("VBR 120-150 kb/s", -5);
+       add_codec_quality ("VBR 100-130 kb/s", -6);
+       add_codec_quality ("VBR 80-120 kb/s",  -7);
+       add_codec_quality ("VBR 70-105 kb/s",  -8);
+       add_codec_quality ("VBR 45-85 kb/s",   -9);
+       /*  Available CBR options are:
+        *  8, 16, 24, 32, 40, 48, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320
+        */
+       add_codec_quality ("CBR  64 kb/s",     64);
+       add_codec_quality ("CBR 128 kb/s",    128);
+       add_codec_quality ("CBR 160 kb/s",    160);
+       add_codec_quality ("CBR 192 kb/s",    192);
+       add_codec_quality ("CBR 256 kb/s",    256);
+
        set_extension (ext);
        set_quality (Q_LossyCompression);
 }

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index 28cccde3cdf74c2f26b4a89e3d479e71904ee0d6..14c57436ab4b51d56dd8be99cf255f1f7abe3f48 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -763,6 +763,13 @@ ExportProfileManager::load_format_from_disk (std::string const & path)
 
        ExportFormatSpecPtr format = handler->add_format (*root);
 
+       if (format->format_id() == ExportFormatBase::F_FFMPEG) {
+               std::string unused;
+               if (!ArdourVideoToolPaths::transcoder_exe (unused, unused)) {
+                       error << string_compose (_("Ignored format '%1': encoder is not avilable"), path) << endmsg;
+                       return;
+               }
+       }
        /* Handle id to filename mapping and don't add duplicates to list */
 
        FilePair pair (format->id(), path);