AudioConverterX: split non-wrapper methods into new AudioConverterXX

nu774 · May 4, 2017 · 907d7da · 907d7da
1 parent 438cc10
commit 907d7da
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 67 deletions.
diff --git a/AudioConverterX.cpp b/AudioConverterX.cpp
@@ -240,51 +240,3 @@ void AudioConverterX::setCodecQuality(UInt32 value)
     CHECKCA(AudioConverterSetProperty(m_converter.get(),
                 kAudioConverterCodecQuality, sizeof value, &value));
 }
-
-// helpers
-double AudioConverterX::getClosestAvailableBitRate(double value)
-{
-    std::vector<AudioValueRange> rates;
-    getApplicableEncodeBitRates(&rates);
-    double distance = std::numeric_limits<double>::max();
-    double pick = 0;
-    for (auto it = rates.begin(); it != rates.end(); ++it) {
-        if (!it->mMinimum) continue;
-        double diff = std::abs(value - it->mMinimum);
-        if (distance > diff) {
-            distance = diff;
-            pick = it->mMinimum;
-        }
-    }
-    return pick;
-}
-
-std::string AudioConverterX::getConfigAsString()
-{
-    std::string s;
-    AudioStreamBasicDescription asbd;
-    getOutputStreamDescription(&asbd);
-    UInt32 codec = asbd.mFormatID;
-    if (codec == 'aac ')
-        s = "AAC-LC Encoder";
-    else if (codec == 'aach')
-        s = "AAC-HE Encoder";
-    else
-        s = "Apple Lossless Encoder";
-    if (codec != 'aac ' && codec != 'aach')
-        return s;
-    UInt32 value = getBitRateControlMode();
-    const char * strategies[] = { "CBR", "ABR", "CVBR", "TVBR" };
-    s += strutil::format(", %s", strategies[value]);
-    if (value == kAudioCodecBitRateControlMode_Variable) {
-        value = getSoundQualityForVBR();
-        s += strutil::format(" q%d", value);
-    } else {
-        value = getEncodeBitRate();
-        s += strutil::format(" %gkbps", value / 1000.0);
-    }
-    value = getCodecQuality();
-    s += strutil::format(", Quality %d", value);
-    return s;
-}
-
diff --git a/AudioConverterX.h b/AudioConverterX.h
@@ -49,10 +49,6 @@ class AudioConverterX {
     void setSoundQualityForVBR(UInt32 value);
     UInt32 getCodecQuality();
     void setCodecQuality(UInt32 value);
-
-    // helpers
-    double getClosestAvailableBitRate(double value);
-    std::string getConfigAsString();
 };
 
 #endif
diff --git a/AudioConverterXX.cpp b/AudioConverterXX.cpp
@@ -0,0 +1,52 @@
+#include "AudioConverterXX.h"
+#include <limits>
+#include <cmath>
+#include "CoreAudio/AudioCodec.h"
+#include "cautil.h"
+
+double AudioConverterXX::getClosestAvailableBitRate(double value)
+{
+    std::vector<AudioValueRange> rates;
+    getApplicableEncodeBitRates(&rates);
+    double distance = std::numeric_limits<double>::max();
+    double pick = 0;
+    for (auto it = rates.begin(); it != rates.end(); ++it) {
+        if (!it->mMinimum) continue;
+        double diff = std::abs(value - it->mMinimum);
+        if (distance > diff) {
+            distance = diff;
+            pick = it->mMinimum;
+        }
+    }
+    return pick;
+}
+
+std::string AudioConverterXX::getConfigAsString()
+{
+    std::string s;
+    AudioStreamBasicDescription asbd;
+    getOutputStreamDescription(&asbd);
+    UInt32 codec = asbd.mFormatID;
+    if (codec == 'aac ')
+        s = "AAC-LC Encoder";
+    else if (codec == 'aach')
+        s = "AAC-HE Encoder";
+    else
+        s = "Apple Lossless Encoder";
+    if (codec != 'aac ' && codec != 'aach')
+        return s;
+    UInt32 value = getBitRateControlMode();
+    const char * strategies[] = { "CBR", "ABR", "CVBR", "TVBR" };
+    s += strutil::format(", %s", strategies[value]);
+    if (value == kAudioCodecBitRateControlMode_Variable) {
+        value = getSoundQualityForVBR();
+        s += strutil::format(" q%d", value);
+    } else {
+        value = getEncodeBitRate();
+        s += strutil::format(" %gkbps", value / 1000.0);
+    }
+    value = getCodecQuality();
+    s += strutil::format(", Quality %d", value);
+    return s;
+}
+
diff --git a/AudioConverterXX.h b/AudioConverterXX.h
@@ -0,0 +1,20 @@
+#ifndef AudioConverterXX_H
+#define AudioConverterXX_H
+
+#include "AudioConverterX.h"
+
+class AudioConverterXX : public AudioConverterX {
+public:
+    AudioConverterXX() {}
+    AudioConverterXX(AudioConverterRef converter, bool takeOwn)
+        : AudioConverterX(converter, takeOwn)
+    {}
+    AudioConverterXX(const AudioStreamBasicDescription &iasbd,
+                     const AudioStreamBasicDescription &oasbd)
+        : AudioConverterX(iasbd, oasbd)
+    {}
+    double getClosestAvailableBitRate(double value);
+    std::string getConfigAsString();
+};
+
+#endif
diff --git a/CoreAudioEncoder.cpp b/CoreAudioEncoder.cpp
@@ -1,7 +1,7 @@
 #include "CoreAudioEncoder.h"
 #include "cautil.h"
 
-CoreAudioEncoder::CoreAudioEncoder(AudioConverterX &converter)
+CoreAudioEncoder::CoreAudioEncoder(AudioConverterXX &converter)
     : m_converter(converter),
       m_variable_packet_len(false)
 {

diff --git a/CoreAudioEncoder.h b/CoreAudioEncoder.h
@@ -2,11 +2,11 @@
 #define CoreAudioEncoder_H
 
 #include "CoreAudioToolbox.h"
-#include "AudioConverterX.h"
+#include "AudioConverterXX.h"
 #include "IEncoder.h"
 
 class CoreAudioEncoder: public IEncoder, public IEncoderStat {
-    AudioConverterX m_converter;
+    AudioConverterXX m_converter;
     bool m_requires_packet_desc;
     bool m_variable_packet_len;
     std::shared_ptr<ISource> m_src;
@@ -17,13 +17,13 @@ class CoreAudioEncoder: public IEncoder, public IEncoderStat {
     AudioStreamBasicDescription m_input_desc, m_output_desc;
     EncoderStat m_stat;
 public:
-    CoreAudioEncoder(AudioConverterX &converter);
+    CoreAudioEncoder(AudioConverterXX &converter);
     virtual ~CoreAudioEncoder() {};
     void setSource(const std::shared_ptr<ISource> &source) { m_src = source; }
     void setSink(const std::shared_ptr<ISink> &sink) { m_sink = sink; }
     uint32_t encodeChunk(UInt32 npackets);
     virtual AudioFilePacketTableInfo getGaplessInfo();
-    AudioConverterX getConverter() { return m_converter; }
+    AudioConverterXX &getConverter() { return m_converter; }
     ISource *src() { return m_src.get(); }
     const AudioStreamBasicDescription &getInputDescription() const
     {

diff --git a/CoreAudioPaddedEncoder.cpp b/CoreAudioPaddedEncoder.cpp
@@ -3,7 +3,7 @@ extern "C" {
 #include "lpc.h"
 }
 
-CoreAudioPaddedEncoder::CoreAudioPaddedEncoder(AudioConverterX &converter,
+CoreAudioPaddedEncoder::CoreAudioPaddedEncoder(AudioConverterXX &converter,
                                                uint32_t num_priming)
     : CoreAudioEncoder(converter),
       m_num_priming(num_priming),

diff --git a/CoreAudioPaddedEncoder.h b/CoreAudioPaddedEncoder.h
@@ -15,7 +15,7 @@ class CoreAudioPaddedEncoder: public CoreAudioEncoder {
     size_t (CoreAudioPaddedEncoder::*m_read)(void *, size_t);
     void (CoreAudioPaddedEncoder::*m_write)(const void *, size_t, size_t);
 public:
-    CoreAudioPaddedEncoder(AudioConverterX &converter,
+    CoreAudioPaddedEncoder(AudioConverterXX &converter,
                            uint32_t num_priming=2112);
     AudioFilePacketTableInfo getGaplessInfo();
 protected:

diff --git a/filters/CoreAudioResampler.cpp b/filters/CoreAudioResampler.cpp
@@ -28,7 +28,7 @@ CoreAudioResampler::CoreAudioResampler(const std::shared_ptr<ISource> &src,
 void CoreAudioResampler::init()
 {
     const AudioStreamBasicDescription &asbd = source()->getSampleFormat();
-    m_converter = AudioConverterX(asbd, m_asbd);
+    m_converter = AudioConverterXX(asbd, m_asbd);
     m_converter.setSampleRateConverterQuality(m_quality);
     m_converter.setSampleRateConverterComplexity(m_complexity);
     m_encoder.reset(new CoreAudioEncoder(m_converter));

diff --git a/filters/CoreAudioResampler.h b/filters/CoreAudioResampler.h
@@ -11,7 +11,7 @@ class CoreAudioResampler: public FilterBase, public ISink {
     int64_t m_position;
     int64_t m_length;
     double m_rate;
-    AudioConverterX m_converter;
+    AudioConverterXX m_converter;
     std::shared_ptr<CoreAudioEncoder> m_encoder;
     AudioStreamBasicDescription m_asbd;
 public:

diff --git a/main.cpp b/main.cpp
@@ -567,7 +567,7 @@ select_timeline(std::shared_ptr<ISeekableSource> src, const Options & opts)
 
 #ifdef QAAC
 static
-void config_aac_codec(AudioConverterX &converter, const Options &opts);
+void config_aac_codec(AudioConverterXX &converter, const Options &opts);
 
 inline uint32_t bound_quality(uint32_t n)
 {
@@ -658,7 +658,7 @@ void build_filter_chain_sub(std::shared_ptr<ISeekableSource> src,
                 chanmap::getChannelLayoutForCodec(*channel_layout);
             AudioStreamBasicDescription iiasbd = iasbd;
             iiasbd.mSampleRate = closest_rate;
-            AudioConverterX converter(iasbd, oasbd);
+            AudioConverterXX converter(iasbd, oasbd);
             converter.setInputChannelLayout(acl);
             converter.setOutputChannelLayout(acl);
             config_aac_codec(converter, opts);
@@ -1062,7 +1062,7 @@ void show_available_codec_setttings(UInt32 fmt)
             oasbd.mSampleRate = iasbd.mSampleRate;
             oasbd.mChannelsPerFrame = iasbd.mChannelsPerFrame;
 
-            AudioConverterX converter(iasbd, oasbd);
+            AudioConverterXX converter(iasbd, oasbd);
             converter.setInputChannelLayout(acl);
             converter.setOutputChannelLayout(acl);
             converter.setBitRateControlMode(
@@ -1186,7 +1186,7 @@ void set_dll_directories(int verbose)
 }
 
 static
-void config_aac_codec(AudioConverterX &converter,
+void config_aac_codec(AudioConverterXX &converter,
                       const Options &opts)
 {
     converter.setBitRateControlMode(opts.method);
@@ -1221,7 +1221,7 @@ void config_aac_codec(AudioConverterX &converter,
 }
 
 static
-void set_encoding_params(AudioConverterX &converter, ITagStore *store)
+void set_encoding_params(AudioConverterXX &converter, ITagStore *store)
 {
     UInt32 mode = converter.getBitRateControlMode();
     UInt32 bitrate = converter.getEncodeBitRate();
@@ -1262,7 +1262,7 @@ void encode_file(const std::shared_ptr<ISeekableSource> &src,
         decode_file(chain, ofilename, opts, oasbd, channel_layout);
         return;
     }
-    AudioConverterX converter(iasbd, oasbd);
+    AudioConverterXX converter(iasbd, oasbd);
     AudioChannelLayout acl = { 0 };
     acl.mChannelLayoutTag = chanmap::getChannelLayoutForCodec(channel_layout);
     converter.setInputChannelLayout(acl);

diff --git a/vcproject/qaac/qaac.vcxproj b/vcproject/qaac/qaac.vcxproj
@@ -115,6 +115,7 @@
     <ClCompile Include="..\..\input\InputFactory.cpp" />
     <ClCompile Include="..\..\filters\CoreAudioResampler.cpp" />
     <ClCompile Include="..\..\AudioConverterX.cpp" />
+    <ClCompile Include="..\..\AudioConverterXX.cpp" />
     <ClCompile Include="..\..\cautil.cpp" />
     <ClCompile Include="..\..\CoreAudioEncoder.cpp" />
     <ClCompile Include="..\..\CoreAudioPaddedEncoder.cpp" />