///////////////////////////////////////////////////////////////////////////////
// LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2010 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
#include "Decoder_AAC.h"
+//Internal
#include "Global.h"
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
#include <QDir>
#include <QProcess>
#include <QRegExp>
AACDecoder::AACDecoder(void)
:
- m_binary(lamexp_lookup_tool("faad.exe"))
+ m_binary(lamexp_tools_lookup("faad.exe"))
{
if(m_binary.isEmpty())
{
- throw "Error initializing AAC decoder. Tool 'faad.exe' is not registred!";
+ MUTILS_THROW("Error initializing AAC decoder. Tool 'faad.exe' is not registred!");
}
}
bool bTimeout = false;
bool bAborted = false;
- QRegExp regExp("[^\\w](\\d+)%\\s+decoding\\s+");
+ QRegExp regExp("\\[(\\d+)%\\]\\s+decoding\\s+");
while(process.state() != QProcess::NotRunning)
{
emit messageLogged("\nABORTED BY USER !!!");
break;
}
- process.waitForReadyRead();
+ process.waitForReadyRead(m_processTimeoutInterval);
if(!process.bytesAvailable() && process.state() == QProcess::Running)
{
process.kill();
qWarning("FAAD process timed out <-- killing!");
+ emit messageLogged("\nPROCESS TIMEOUT !!!");
bTimeout = true;
break;
}
emit statusUpdated(100);
emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
- if(bTimeout || bAborted || process.exitStatus() != QProcess::NormalExit || QFileInfo(outputFile).size() == 0)
+ if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
{
return false;
}
{
if(formatType.compare("AAC", Qt::CaseInsensitive) == 0)
{
- if(formatProfile.compare("LC", Qt::CaseInsensitive) == 0 || formatProfile.compare("HE", Qt::CaseInsensitive) == 0)
+ QStringList profileParts = formatProfile.split(" ", QString::SkipEmptyParts);
+ if(profileParts.contains("LC", Qt::CaseInsensitive) || profileParts.contains("HE-AAC", Qt::CaseInsensitive) || profileParts.contains("HE-AACv2", Qt::CaseInsensitive))
{
- if(formatVersion.compare("Version 2", Qt::CaseInsensitive) == 0 || formatVersion.compare("Version 4", Qt::CaseInsensitive) == 0)
+ if(formatVersion.compare("Version 2", Qt::CaseInsensitive) == 0 || formatVersion.compare("Version 4", Qt::CaseInsensitive) == 0 || formatVersion.isEmpty())
{
return true;
}
return false;
}
+const AbstractDecoder::supportedType_t *AACDecoder::supportedTypes(void)
+{
+ static const char *exts[] =
+ {
+ "mp4", "m4a", "aac", NULL
+ };
+
+ static const supportedType_t s_supportedTypes[] =
+ {
+ { "Advanced Audio Coding", exts },
+ { NULL, NULL }
+ };
+
+ return s_supportedTypes;
+}