///////////////////////////////////////////////////////////////////////////////
// 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 <QProcess>
#include <QDir>
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#define IS_UNICODE(STR) (qstricmp(STR.toUtf8().constData(), QString::fromLocal8Bit(STR.toLocal8Bit()).toUtf8().constData()))
+///////////////////////////////////////////////////////////////////////////////
+// Encoder Info
+///////////////////////////////////////////////////////////////////////////////
+
+class VorbisEncoderInfo : public AbstractEncoderInfo
+{
+ virtual bool isModeSupported(int mode) const
+ {
+ switch(mode)
+ {
+ case SettingsModel::VBRMode:
+ case SettingsModel::ABRMode:
+ return true;
+ break;
+ case SettingsModel::CBRMode:
+ return false;
+ break;
+ default:
+ MUTILS_THROW("Bad RC mode specified!");
+ }
+ }
+
+ virtual int valueCount(int mode) const
+ {
+ switch(mode)
+ {
+ case SettingsModel::VBRMode:
+ return 12;
+ break;
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ return 60;
+ break;
+ default:
+ MUTILS_THROW("Bad RC mode specified!");
+ }
+ }
+
+ virtual int valueAt(int mode, int index) const
+ {
+ switch(mode)
+ {
+ case SettingsModel::VBRMode:
+ return qBound(-2, index - 2, 10);
+ break;
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ return qBound(32, (index + 4) * 8, 500);
+ 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 = "OggEnc2 Vorbis Encoder (aoTuV)";
+ return s_description;
+ }
+}
+static const g_vorbisEncoderInfo;
+
+///////////////////////////////////////////////////////////////////////////////
+// Encoder implementation
+///////////////////////////////////////////////////////////////////////////////
VorbisEncoder::VorbisEncoder(void)
:
- m_binary_i386(lamexp_lookup_tool("oggenc2_i386.exe")),
- m_binary_sse2(lamexp_lookup_tool("oggenc2_sse2.exe")),
- m_binary_x64(lamexp_lookup_tool("oggenc2_x64.exe"))
+ m_binary(lamexp_tools_lookup("oggenc2.exe"))
{
- if(m_binary_i386.isEmpty() || m_binary_sse2.isEmpty() || m_binary_x64.isEmpty())
+ if(m_binary.isEmpty())
{
- throw "Error initializing Vorbis encoder. Tool 'oggenc2.exe' is not registred!";
+ MUTILS_THROW("Error initializing Vorbis encoder. Tool 'oggenc2.exe' is not registred!");
}
+
+ m_configBitrateMaximum = 0;
+ m_configBitrateMinimum = 0;
+ m_configSamplingRate = 0;
}
VorbisEncoder::~VorbisEncoder(void)
{
}
-bool VorbisEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag)
+bool VorbisEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag)
{
QProcess process;
QStringList args;
const QString baseName = QFileInfo(outputFile).fileName();
- lamexp_cpu_t cpuFeatures = lamexp_detect_cpu_features();
- const QString &binary = (cpuFeatures.x64 ? m_binary_x64 : ((cpuFeatures.intel && cpuFeatures.sse && cpuFeatures.sse2) ? m_binary_sse2 : m_binary_i386));
switch(m_configRCMode)
{
case SettingsModel::VBRMode:
- args << "-q" << QString::number(max(-2, min(10, m_configBitrate)));
+ args << "-q" << QString::number(qBound(-2, m_configBitrate - 2, 10));
break;
case SettingsModel::ABRMode:
- args << "-b" << QString::number(max(32, min(500, (m_configBitrate * 8))));
+ args << "-b" << QString::number(qBound(32, (m_configBitrate + 4) * 8, 500));
break;
default:
- throw "Bad rate-control mode!";
+ MUTILS_THROW("Bad rate-control mode!");
break;
}
- if(!metaInfo.fileName().isEmpty()) args << "-t" << metaInfo.fileName();
- if(!metaInfo.fileArtist().isEmpty()) args << "-a" << metaInfo.fileArtist();
- if(!metaInfo.fileAlbum().isEmpty()) args << "-l" << metaInfo.fileAlbum();
- if(!metaInfo.fileGenre().isEmpty()) args << "-G" << metaInfo.fileGenre();
- if(!metaInfo.fileComment().isEmpty()) args << "-c" << QString("comment=%1").arg(metaInfo.fileComment());
- if(metaInfo.fileYear()) args << "-d" << QString::number(metaInfo.fileYear());
- if(metaInfo.filePosition()) args << "-N" << QString::number(metaInfo.filePosition());
+ if((m_configBitrateMaximum > 0) && (m_configBitrateMinimum > 0) && (m_configBitrateMinimum <= m_configBitrateMaximum))
+ {
+ args << "--min-bitrate" << QString::number(qBound(32, m_configBitrateMinimum, 500));
+ args << "--max-bitrate" << QString::number(qBound(32, m_configBitrateMaximum, 500));
+ }
+
+ if(m_configSamplingRate > 0)
+ {
+ args << "--resample" << QString::number(m_configSamplingRate) << "--converter" << QString::number(0);
+ }
+
+ if(!metaInfo.title().isEmpty()) args << "-t" << cleanTag(metaInfo.title());
+ if(!metaInfo.artist().isEmpty()) args << "-a" << cleanTag(metaInfo.artist());
+ if(!metaInfo.album().isEmpty()) args << "-l" << cleanTag(metaInfo.album());
+ if(!metaInfo.genre().isEmpty()) args << "-G" << cleanTag(metaInfo.genre());
+ if(!metaInfo.comment().isEmpty()) args << "-c" << QString("comment=%1").arg(cleanTag(metaInfo.comment()));
+ if(metaInfo.year()) args << "-d" << QString::number(metaInfo.year());
+ if(metaInfo.position()) args << "-N" << QString::number(metaInfo.position());
//args << "--tv" << QString().sprintf("Encoder=LameXP v%d.%02d.%04d [%s]", lamexp_version_major(), lamexp_version_minor(), lamexp_version_build(), lamexp_version_release());
+ if(!m_configCustomParams.isEmpty()) args << m_configCustomParams.split(" ", QString::SkipEmptyParts);
+
args << "-o" << QDir::toNativeSeparators(outputFile);
args << QDir::toNativeSeparators(sourceFile);
- if(!startProcess(process, binary, args))
+ if(!startProcess(process, m_binary, args))
{
return false;
}
bool bTimeout = false;
bool bAborted = false;
+ int prevProgress = -1;
QRegExp regExp("\\[.*(\\d+)[.,](\\d+)%\\]");
emit messageLogged("\nABORTED BY USER !!!");
break;
}
- process.waitForReadyRead();
+ process.waitForReadyRead(m_processTimeoutInterval);
if(!process.bytesAvailable() && process.state() == QProcess::Running)
{
process.kill();
qWarning("OggEnc process timed out <-- killing!");
+ emit messageLogged("\nPROCESS TIMEOUT !!!");
bTimeout = true;
break;
}
{
bool ok = false;
int progress = regExp.cap(1).toInt(&ok);
- if(ok) emit statusUpdated(progress);
+ if(ok && (progress > prevProgress))
+ {
+ emit statusUpdated(progress);
+ prevProgress = qMin(progress + 2, 99);
+ }
}
else if(!text.isEmpty())
{
emit statusUpdated(100);
emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
- if(bTimeout || bAborted || process.exitStatus() != QProcess::NormalExit)
+ if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
{
return false;
}
return false;
}
+
+void VorbisEncoder::setBitrateLimits(int minimumBitrate, int maximumBitrate)
+{
+ m_configBitrateMinimum = minimumBitrate;
+ m_configBitrateMaximum = maximumBitrate;
+}
+
+void VorbisEncoder::setSamplingRate(int value)
+{
+ m_configSamplingRate = value;
+}
+
+const AbstractEncoderInfo *VorbisEncoder::getEncoderInfo(void)
+{
+ return &g_vorbisEncoderInfo;
+}
OSDN Git Service
