Added detection of 64-Bit QAAC encoder + fixed a regression in def8a9cd6e13defb09a4d2...

[lamexp/LameXP.git] / src / Encoder_AAC_FHG.cpp

diff --git a/src/Encoder_AAC_FHG.cpp b/src/Encoder_AAC_FHG.cpp
index 728d760..b6494a6 100644 (file)
--- a/src/Encoder_AAC_FHG.cpp
+++ b/src/Encoder_AAC_FHG.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "License.txt" file.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,14 +29,109 @@
 #include <QProcess>
 #include <QDir>
 
+static int index2bitrate(const int index)
+{
+       return (index < 32) ? ((index + 1) * 8) : ((index - 15) * 16);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Encoder Info
+///////////////////////////////////////////////////////////////////////////////
+
+class FHGAACEncoderInfo : public AbstractEncoderInfo
+{
+       virtual bool isModeSupported(int mode) const
+       {
+               switch(mode)
+               {
+               case SettingsModel::VBRMode:
+               case SettingsModel::CBRMode:
+                       return true;
+                       break;
+               case SettingsModel::ABRMode:
+                       return false;
+                       break;
+               default:
+                       MUTILS_THROW("Bad RC mode specified!");
+               }
+       }
+
+       virtual int valueCount(int mode) const
+       {
+               switch(mode)
+               {
+               case SettingsModel::VBRMode:
+                       return 6;
+                       break;
+               case SettingsModel::ABRMode:
+               case SettingsModel::CBRMode:
+                       return 52;
+                       break;
+               default:
+                       MUTILS_THROW("Bad RC mode specified!");
+               }
+       }
+
+       virtual int valueAt(int mode, int index) const
+       {
+               switch(mode)
+               {
+               case SettingsModel::VBRMode:
+                       return qBound(1, index + 1, 6);
+                       break;
+               case SettingsModel::ABRMode:
+               case SettingsModel::CBRMode:
+                       return qBound(8, index2bitrate(index), 576);
+                       break;
+               default:
+                       MUTILS_THROW("Bad RC mode specified!");
+               }
+       }
+
+       virtual int valueType(int mode) const
+       {
+               switch(mode)
+               {
+               case SettingsModel::VBRMode:
+                       return TYPE_QUALITY_LEVEL_INT;
+                       break;
+               case SettingsModel::ABRMode:
+                       return TYPE_APPROX_BITRATE;
+                       break;
+               case SettingsModel::CBRMode:
+                       return TYPE_BITRATE;
+                       break;
+               default:
+                       MUTILS_THROW("Bad RC mode specified!");
+               }
+       }
+
+       virtual const char *description(void) const
+       {
+               static const char* s_description = "fhgaacenc/Winamp (\x0C2\x0A9 Nullsoft)";
+               return s_description;
+       }
+
+       virtual const char *extension(void) const
+       {
+               static const char* s_extension = "mp4";
+               return s_extension;
+       }
+}
+static const g_fhgAacEncoderInfo;
+
+///////////////////////////////////////////////////////////////////////////////
+// Encoder implementation
+///////////////////////////////////////////////////////////////////////////////
+
 FHGAACEncoder::FHGAACEncoder(void)
 :
-       m_binary_enc(lamexp_lookup_tool("fhgaacenc.exe")),
-       m_binary_dll(lamexp_lookup_tool("enc_fhgaac.dll"))
+       m_binary_enc(lamexp_tools_lookup("fhgaacenc.exe")),
+       m_binary_dll(lamexp_tools_lookup("enc_fhgaac.dll"))
 {
        if(m_binary_enc.isEmpty() || m_binary_dll.isEmpty())
        {
-               throw "Error initializing FhgAacEnc. Tool 'fhgaacenc.exe' is not registred!";
+               MUTILS_THROW("Error initializing FhgAacEnc. Tool 'fhgaacenc.exe' is not registred!");
        }
 
        m_configProfile = 0;
@@ -45,12 +141,12 @@ FHGAACEncoder::~FHGAACEncoder(void)
 {
 }
 
-bool FHGAACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag)
+bool FHGAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag)
 {
        QProcess process;
        QStringList args;
        
-       int maxBitrate = 500;
+       int maxBitrate = 576;
 
        if(m_configRCMode == SettingsModel::CBRMode)
        {
@@ -73,13 +169,13 @@ bool FHGAACEncoder::encode(const QString &sourceFile, const AudioFileModel &meta
        switch(m_configRCMode)
        {
        case SettingsModel::CBRMode:
-               args << "--cbr" << QString::number(qMax(32, qMin(maxBitrate, (m_configBitrate * 8))));
+               args << "--cbr" << QString::number(qBound(8, index2bitrate(m_configBitrate), maxBitrate));
                break;
        case SettingsModel::VBRMode:
-               args << "--vbr" << QString::number(qRound(static_cast<double>(m_configBitrate) / 5.0) + 1);
+               args << "--vbr" << QString::number(qBound(1, m_configBitrate + 1, 6));
                break;
        default:
-               throw "Bad rate-control mode!";
+               MUTILS_THROW("Bad rate-control mode!");
                break;
        }
 
@@ -158,11 +254,6 @@ bool FHGAACEncoder::encode(const QString &sourceFile, const AudioFileModel &meta
        return true;
 }
 
-QString FHGAACEncoder::extension(void)
-{
-       return "mp4";
-}
-
 bool FHGAACEncoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
 {
        if(containerType.compare("Wave", Qt::CaseInsensitive) == 0)
@@ -198,3 +289,8 @@ void FHGAACEncoder::setProfile(int profile)
 {
        m_configProfile = profile;
 }
+
+const AbstractEncoderInfo *FHGAACEncoder::getEncoderInfo(void)
+{
+       return &g_fhgAacEncoderInfo;
+}