From: LoRd_MuldeR Date: Sat, 12 Nov 2016 13:57:58 +0000 (+0100) Subject: Extended AbstractEncoder::encode() interface to pass the number of channels to the... X-Git-Tag: Release_414~7 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=64272450c6660919eca80fbd0cd3d871e5e785e6;p=lamexp%2FLameXP.git Extended AbstractEncoder::encode() interface to pass the number of channels to the encoder implementation. --- diff --git a/src/Config.h b/src/Config.h index a74aa4b9..fb8ff117 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE RC #define VER_LAMEXP_PATCH 5 -#define VER_LAMEXP_BUILD 1926 +#define VER_LAMEXP_BUILD 1927 #define VER_LAMEXP_CONFG 1818 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Encoder_AAC.cpp b/src/Encoder_AAC.cpp index 730b8021..47065d1e 100644 --- a/src/Encoder_AAC.cpp +++ b/src/Encoder_AAC.cpp @@ -144,7 +144,7 @@ AACEncoder::~AACEncoder(void) { } -bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_AAC.h b/src/Encoder_AAC.h index e620fd77..4b2e7032 100644 --- a/src/Encoder_AAC.h +++ b/src/Encoder_AAC.h @@ -34,7 +34,7 @@ public: AACEncoder(void); ~AACEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual const bool needsTimingInfo(void); diff --git a/src/Encoder_AAC_FDK.cpp b/src/Encoder_AAC_FDK.cpp index 32700398..19ab6ce6 100644 --- a/src/Encoder_AAC_FDK.cpp +++ b/src/Encoder_AAC_FDK.cpp @@ -148,7 +148,7 @@ FDKAACEncoder::~FDKAACEncoder(void) { } -bool FDKAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool FDKAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_AAC_FDK.h b/src/Encoder_AAC_FDK.h index d4c2fb27..6600b61b 100644 --- a/src/Encoder_AAC_FDK.h +++ b/src/Encoder_AAC_FDK.h @@ -34,7 +34,7 @@ public: FDKAACEncoder(void); ~FDKAACEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); //Advanced options diff --git a/src/Encoder_AAC_FHG.cpp b/src/Encoder_AAC_FHG.cpp index 7e08d6cb..20b03caa 100644 --- a/src/Encoder_AAC_FHG.cpp +++ b/src/Encoder_AAC_FHG.cpp @@ -146,7 +146,7 @@ FHGAACEncoder::~FHGAACEncoder(void) { } -bool FHGAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool FHGAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_AAC_FHG.h b/src/Encoder_AAC_FHG.h index 48831aab..87b8c593 100644 --- a/src/Encoder_AAC_FHG.h +++ b/src/Encoder_AAC_FHG.h @@ -34,7 +34,7 @@ public: FHGAACEncoder(void); ~FHGAACEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual const unsigned int *supportedChannelCount(void); virtual const unsigned int *supportedBitdepths(void); diff --git a/src/Encoder_AAC_QAAC.cpp b/src/Encoder_AAC_QAAC.cpp index 05920850..45b0970b 100644 --- a/src/Encoder_AAC_QAAC.cpp +++ b/src/Encoder_AAC_QAAC.cpp @@ -157,7 +157,7 @@ QAACEncoder::~QAACEncoder(void) { } -bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { const QString qaac_bin = m_binary_qaac64.isEmpty() ? m_binary_qaac32 : m_binary_qaac64; diff --git a/src/Encoder_AAC_QAAC.h b/src/Encoder_AAC_QAAC.h index cddda352..5041fbb2 100644 --- a/src/Encoder_AAC_QAAC.h +++ b/src/Encoder_AAC_QAAC.h @@ -34,7 +34,7 @@ public: QAACEncoder(void); ~QAACEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); //Advanced options diff --git a/src/Encoder_AC3.cpp b/src/Encoder_AC3.cpp index 6f5adb1f..d3e82897 100644 --- a/src/Encoder_AC3.cpp +++ b/src/Encoder_AC3.cpp @@ -144,7 +144,7 @@ AC3Encoder::~AC3Encoder(void) { } -bool AC3Encoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool AC3Encoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_AC3.h b/src/Encoder_AC3.h index 4efa7341..353f8f24 100644 --- a/src/Encoder_AC3.h +++ b/src/Encoder_AC3.h @@ -34,7 +34,7 @@ public: AC3Encoder(void); ~AC3Encoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual const unsigned int *supportedChannelCount(void); virtual const unsigned int *supportedSamplerates(void); diff --git a/src/Encoder_Abstract.h b/src/Encoder_Abstract.h index c84d428c..6f5f31b5 100644 --- a/src/Encoder_Abstract.h +++ b/src/Encoder_Abstract.h @@ -66,7 +66,7 @@ public: virtual ~AbstractEncoder(void); //Internal encoder API - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) = 0; + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) = 0; virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion) = 0; virtual const unsigned int *supportedSamplerates(void); virtual const unsigned int *supportedChannelCount(void); diff --git a/src/Encoder_DCA.cpp b/src/Encoder_DCA.cpp index d45ae9fb..adf848c4 100644 --- a/src/Encoder_DCA.cpp +++ b/src/Encoder_DCA.cpp @@ -141,7 +141,7 @@ DCAEncoder::~DCAEncoder(void) { } -bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_DCA.h b/src/Encoder_DCA.h index 0ea881ce..7b8785b6 100644 --- a/src/Encoder_DCA.h +++ b/src/Encoder_DCA.h @@ -34,7 +34,7 @@ public: DCAEncoder(void); ~DCAEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual const unsigned int *supportedChannelCount(void); virtual const unsigned int *supportedBitdepths(void); diff --git a/src/Encoder_FLAC.cpp b/src/Encoder_FLAC.cpp index b63f2eea..f2934a6f 100644 --- a/src/Encoder_FLAC.cpp +++ b/src/Encoder_FLAC.cpp @@ -135,7 +135,7 @@ FLACEncoder::~FLACEncoder(void) { } -bool FLACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool FLACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_FLAC.h b/src/Encoder_FLAC.h index d671683d..00b287dc 100644 --- a/src/Encoder_FLAC.h +++ b/src/Encoder_FLAC.h @@ -34,7 +34,7 @@ public: FLACEncoder(void); ~FLACEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual const unsigned int *supportedChannelCount(void); virtual const unsigned int *supportedBitdepths(void); diff --git a/src/Encoder_MAC.cpp b/src/Encoder_MAC.cpp index 9dd474b0..708015a0 100644 --- a/src/Encoder_MAC.cpp +++ b/src/Encoder_MAC.cpp @@ -136,7 +136,7 @@ MACEncoder::~MACEncoder(void) { } -bool MACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool MACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_MAC.h b/src/Encoder_MAC.h index 1549be55..1b6ae107 100644 --- a/src/Encoder_MAC.h +++ b/src/Encoder_MAC.h @@ -34,7 +34,7 @@ public: MACEncoder(void); ~MACEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); //Encoder info diff --git a/src/Encoder_MP3.cpp b/src/Encoder_MP3.cpp index 73b43f95..ae689dd7 100644 --- a/src/Encoder_MP3.cpp +++ b/src/Encoder_MP3.cpp @@ -146,7 +146,7 @@ MP3Encoder::~MP3Encoder(void) { } -bool MP3Encoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool MP3Encoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_MP3.h b/src/Encoder_MP3.h index 0bf4c710..00cc8ad9 100644 --- a/src/Encoder_MP3.h +++ b/src/Encoder_MP3.h @@ -34,7 +34,7 @@ public: MP3Encoder(void); ~MP3Encoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual const unsigned int *supportedChannelCount(void); diff --git a/src/Encoder_Opus.cpp b/src/Encoder_Opus.cpp index 0b4bcd5a..04568028 100644 --- a/src/Encoder_Opus.cpp +++ b/src/Encoder_Opus.cpp @@ -140,7 +140,7 @@ OpusEncoder::~OpusEncoder(void) { } -bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_Opus.h b/src/Encoder_Opus.h index d313d063..3e9237f1 100644 --- a/src/Encoder_Opus.h +++ b/src/Encoder_Opus.h @@ -34,7 +34,7 @@ public: OpusEncoder(void); ~OpusEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual const unsigned int *supportedChannelCount(void); virtual const unsigned int *supportedBitdepths(void); diff --git a/src/Encoder_Vorbis.cpp b/src/Encoder_Vorbis.cpp index 6330bd27..7cd70ac8 100644 --- a/src/Encoder_Vorbis.cpp +++ b/src/Encoder_Vorbis.cpp @@ -141,7 +141,7 @@ VorbisEncoder::~VorbisEncoder(void) { } -bool VorbisEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool VorbisEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { QProcess process; QStringList args; diff --git a/src/Encoder_Vorbis.h b/src/Encoder_Vorbis.h index 24ac3f77..9bae19ac 100644 --- a/src/Encoder_Vorbis.h +++ b/src/Encoder_Vorbis.h @@ -34,7 +34,7 @@ public: VorbisEncoder(void); ~VorbisEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual void setBitrateLimits(int minimumBitrate, int maximumBitrate); diff --git a/src/Encoder_Wave.cpp b/src/Encoder_Wave.cpp index d4062119..9250f9b5 100644 --- a/src/Encoder_Wave.cpp +++ b/src/Encoder_Wave.cpp @@ -132,7 +132,7 @@ WaveEncoder::~WaveEncoder(void) { } -bool WaveEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) +bool WaveEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag) { emit messageLogged(QString("Copy file \"%1\" to \"%2\"\n").arg(sourceFile, outputFile)); diff --git a/src/Encoder_Wave.h b/src/Encoder_Wave.h index 785409d5..c31d43a7 100644 --- a/src/Encoder_Wave.h +++ b/src/Encoder_Wave.h @@ -34,7 +34,7 @@ public: WaveEncoder(void); ~WaveEncoder(void); - virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag); + virtual bool encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); //Encoder info diff --git a/src/Thread_Process.cpp b/src/Thread_Process.cpp index 0653ab78..eb59d96d 100644 --- a/src/Thread_Process.cpp +++ b/src/Thread_Process.cpp @@ -317,7 +317,7 @@ void ProcessThread::processFile() if(bSuccess && !m_aborted) { m_currentStep = EncodingStep; - bSuccess = m_encoder->encode(sourceFile, m_audioFile.metaInfo(), m_audioFile.techInfo().duration(), m_outFileName, &m_aborted); + bSuccess = m_encoder->encode(sourceFile, m_audioFile.metaInfo(), m_audioFile.techInfo().duration(), m_audioFile.techInfo().audioChannels(), m_outFileName, &m_aborted); } //Clean-up