Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Workaround for a bug that causes MediaInfo to not detect the duration of Wave files (64-Bit only).

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-12-04 20:33:06 +01:00
parent 3e2e6f66e6
commit 8c72137fe1
14 changed files with 96 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Changelog.html
View File

@ -22,6 +22,7 @@ a:visited { color: #0000EE; }
<li>Updated MediaInfo to v0.7.51+ (2011-11-19), compiled with ICL 12.1.6 and MSVC 10.0 <li>Updated MediaInfo to v0.7.51+ (2011-11-19), compiled with ICL 12.1.6 and MSVC 10.0
<li>Implemented coalescing of update signals to reduce the CPU usage of the LameXP process (<a href="http://forum.doom9.org/showpost.php?p=1539631&postcount=507" target="_blank">details</a>) <li>Implemented coalescing of update signals to reduce the CPU usage of the LameXP process (<a href="http://forum.doom9.org/showpost.php?p=1539631&postcount=507" target="_blank">details</a>)
<li>Run more than four instances in parallel on systems with more than four CPU cores (<a href="FAQ.html#89cbd3d0" target="_blank">details</a>) <li>Run more than four instances in parallel on systems with more than four CPU cores (<a href="FAQ.html#89cbd3d0" target="_blank">details</a>)
<li>Workaround for a bug that causes MediaInfo to not detect the duration of Wave files (64-Bit only)
</ul><br> </ul><br>
<a name="4.03"></a>Changes between v4.02 and v4.03:<br><ul> <a name="4.03"></a>Changes between v4.02 and v4.03:<br><ul>

2
doc/Manual.html
View File

@ -16,7 +16,7 @@ a:visited { color: #0000EE; }
<body> <body>
<h3>LameXP - User Manual</h3> <h3>LameXP - User Manual</h3>
<br> <br>
<img src="http://img840.imageshack.us/img840/873/pagenotfoundman.jpg" alt="404" style="border-style:solid;border-width:1px;border-color:LightSteelBlue"><br> <img src="http://lamexp.sourceforge.net/lamexp.png" alt="404" border="0"><br>
<br> <br>
<br> <br>
Sorry, there is no LameXP user manual (yet), but we have an extensive F.A.Q. document ;-)<br> Sorry, there is no LameXP user manual (yet), but we have an extensive F.A.Q. document ;-)<br>

1
etc/Deployment/_deploy.bat
View File

@ -132,6 +132,7 @@ copy "%~dp0\..\..\ReadMe.txt" "%TMP_PATH%"
copy "%~dp0\..\..\License.txt" "%TMP_PATH%" copy "%~dp0\..\..\License.txt" "%TMP_PATH%"
copy "%~dp0\..\..\doc\Changelog.html" "%TMP_PATH%" copy "%~dp0\..\..\doc\Changelog.html" "%TMP_PATH%"
copy "%~dp0\..\..\doc\Translate.html" "%TMP_PATH%" copy "%~dp0\..\..\doc\Translate.html" "%TMP_PATH%"
copy "%~dp0\..\..\doc\Manual.html" "%TMP_PATH%"
copy "%~dp0\..\..\doc\FAQ.html" "%TMP_PATH%" copy "%~dp0\..\..\doc\FAQ.html" "%TMP_PATH%"
REM ------------------------------------------ REM ------------------------------------------
REM :: CREATE PACKAGES :: REM :: CREATE PACKAGES ::

1
etc/NSIS/setup.nsi
View File

@ -466,6 +466,7 @@ Section "-Create Shortcuts"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\Changelog.html" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\Changelog.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_TRANSLATE).lnk" "$INSTDIR\Translate.html" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_TRANSLATE).lnk" "$INSTDIR\Translate.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_FAQ).lnk" "$INSTDIR\FAQ.html" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_FAQ).lnk" "$INSTDIR\FAQ.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_MANUAL).lnk" "$INSTDIR\FAQ.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_UNINSTALL).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_UNINSTALL).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
!insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\Official LameXP Homepage.url" "http://mulder.dummwiedeutsch.de/" !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\Official LameXP Homepage.url" "http://mulder.dummwiedeutsch.de/"

1
etc/Translation/Blank.nsh
View File

@ -38,4 +38,5 @@ LangString LAMEXP_LANG_LINK_CHANGELOG ${LANG_ENGLISH} "Version History"
LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_ENGLISH} "Translator's Guide" LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_ENGLISH} "Translator's Guide"
LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_ENGLISH} "Uninstall" LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_ENGLISH} "Uninstall"
LangString LAMEXP_LANG_LINK_FAQ ${LANG_ENGLISH} "Frequently Asked Questions" LangString LAMEXP_LANG_LINK_FAQ ${LANG_ENGLISH} "Frequently Asked Questions"
LangString LAMEXP_LANG_LINK_MANUAL ${LANG_ENGLISH} "User Manual"
LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_ENGLISH} "You are about to install a Demo (pre-release) version of LameXP!" LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_ENGLISH} "You are about to install a Demo (pre-release) version of LameXP!"

2
etc/Translation/Blank.ts
View File

@ -2896,13 +2896,11 @@
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="424"/> <location filename="../../src/Dialog_Update.cpp" line="424"/>
<location filename="../../src/Dialog_Update.cpp" line="1006"/>
<source>Network connectivity test has failed!</source> <source>Network connectivity test has failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="427"/> <location filename="../../src/Dialog_Update.cpp" line="427"/>
<location filename="../../src/Dialog_Update.cpp" line="1009"/>
<source>Please make sure your internet connection is working properly and try again.</source> <source>Please make sure your internet connection is working properly and try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

1
etc/Translation/LameXP_DE.nsh
View File

@ -38,4 +38,5 @@ LangString LAMEXP_LANG_LINK_CHANGELOG ${LANG_GERMAN} "Versionshistorie"
LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_GERMAN} "Leitfaden für Übersetzer" LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_GERMAN} "Leitfaden für Übersetzer"
LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_GERMAN} "Deinstallieren" LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_GERMAN} "Deinstallieren"
LangString LAMEXP_LANG_LINK_FAQ ${LANG_GERMAN} "Häufig Gestellte Fragen" LangString LAMEXP_LANG_LINK_FAQ ${LANG_GERMAN} "Häufig Gestellte Fragen"
LangString LAMEXP_LANG_LINK_MANUAL ${LANG_GERMAN} "Benutzerhandbuch"
LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_GERMAN} "Sie sind dabei eine Demo (Test) Version von LameXP zu installieren!" LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_GERMAN} "Sie sind dabei eine Demo (Test) Version von LameXP zu installieren!"

1
etc/Translation/LameXP_ES.nsh
View File

@ -38,4 +38,5 @@ LangString LAMEXP_LANG_LINK_CHANGELOG ${LANG_SPANISH} "Historial de version
LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_SPANISH} "Guía de traducción" LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_SPANISH} "Guía de traducción"
LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_SPANISH} "Desinstalar" LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_SPANISH} "Desinstalar"
LangString LAMEXP_LANG_LINK_FAQ ${LANG_SPANISH} "Preguntas frecuentes" LangString LAMEXP_LANG_LINK_FAQ ${LANG_SPANISH} "Preguntas frecuentes"
LangString LAMEXP_LANG_LINK_MANUAL ${LANG_SPANISH} "User Manual"
LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_SPANISH} "You are about to install a Demo (pre-release) version of LameXP!" LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_SPANISH} "You are about to install a Demo (pre-release) version of LameXP!"

2
etc/Translation/LameXP_PL.ts
View File

@ -2896,13 +2896,11 @@
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="424"/> <location filename="../../src/Dialog_Update.cpp" line="424"/>
<location filename="../../src/Dialog_Update.cpp" line="1006"/>
<source>Network connectivity test has failed!</source> <source>Network connectivity test has failed!</source>
<translation type="unfinished">Test połączenia internetowego zakończony niepowodzeniem!</translation> <translation type="unfinished">Test połączenia internetowego zakończony niepowodzeniem!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="427"/> <location filename="../../src/Dialog_Update.cpp" line="427"/>
<location filename="../../src/Dialog_Update.cpp" line="1009"/>
<source>Please make sure your internet connection is working properly and try again.</source> <source>Please make sure your internet connection is working properly and try again.</source>
<translation type="unfinished">Upewnij się że połączenie internetowe działa prawidłowo i spróbuj ponownie.</translation> <translation type="unfinished">Upewnij się że połączenie internetowe działa prawidłowo i spróbuj ponownie.</translation>
</message> </message>

1
etc/Translation/LameXP_RU.nsh
View File

@ -38,4 +38,5 @@ LangString LAMEXP_LANG_LINK_CHANGELOG ${LANG_RUSSIAN} "История ве
LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_RUSSIAN} "Руководство Переводчика" LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_RUSSIAN} "Руководство Переводчика"
LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_RUSSIAN} "Деинсталляция" LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_RUSSIAN} "Деинсталляция"
LangString LAMEXP_LANG_LINK_FAQ ${LANG_RUSSIAN} "Часто Задаваемые Вопросы" LangString LAMEXP_LANG_LINK_FAQ ${LANG_RUSSIAN} "Часто Задаваемые Вопросы"
LangString LAMEXP_LANG_LINK_MANUAL ${LANG_RUSSIAN} "User Manual"
LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_RUSSIAN} "Вы собираетесь установить ДЕМО (пред-релизную) версию LameXP!" LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_RUSSIAN} "Вы собираетесь установить ДЕМО (пред-релизную) версию LameXP!"

1
etc/Translation/LameXP_UK.nsh
View File

@ -38,4 +38,5 @@ LangString LAMEXP_LANG_LINK_CHANGELOG ${LANG_UKRAINIAN} "Історія В
LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_UKRAINIAN} "Допомога Перекладачу" LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_UKRAINIAN} "Допомога Перекладачу"
LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_UKRAINIAN} "Видалення" LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_UKRAINIAN} "Видалення"
LangString LAMEXP_LANG_LINK_FAQ ${LANG_UKRAINIAN} "Часті Питання" LangString LAMEXP_LANG_LINK_FAQ ${LANG_UKRAINIAN} "Часті Питання"
LangString LAMEXP_LANG_LINK_MANUAL ${LANG_UKRAINIAN} "User Manual"
LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_UKRAINIAN} "Ви збираєтесь встановити Демо (тестову) версію LameXP!" LangString LAMEXP_LANG_PRERELEASE_WARNING ${LANG_UKRAINIAN} "Ви збираєтесь встановити Демо (тестову) версію LameXP!"

4
src/Config.h
View File

@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 6 #define VER_LAMEXP_PATCH 7
#define VER_LAMEXP_BUILD 801 #define VER_LAMEXP_BUILD 802
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

91
src/Encoder_AAC.cpp
View File

@ -30,9 +30,10 @@
AACEncoder::AACEncoder(void) AACEncoder::AACEncoder(void)
: :
m_binary_enc(lamexp_lookup_tool("neroAacEnc.exe")), m_binary_enc(lamexp_lookup_tool("neroAacEnc.exe")),
m_binary_tag(lamexp_lookup_tool("neroAacTag.exe")) m_binary_tag(lamexp_lookup_tool("neroAacTag.exe")),
m_binary_sox(lamexp_lookup_tool("sox.exe"))
{ {
if(m_binary_enc.isEmpty() || m_binary_tag.isEmpty()) if(m_binary_enc.isEmpty() || m_binary_tag.isEmpty() || m_binary_sox.isEmpty())
{ {
throw "Error initializing AAC encoder. Tool 'neroAacEnc.exe' is not registred!"; throw "Error initializing AAC encoder. Tool 'neroAacEnc.exe' is not registred!";
} }
@ -47,6 +48,8 @@ AACEncoder::~AACEncoder(void)
bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag) bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag)
{ {
const unsigned int fileDuration = (metaInfo.fileDuration() > 0) ? metaInfo.fileDuration() : detectLength(sourceFile, abortFlag);
QProcess process; QProcess process;
QStringList args; QStringList args;
const QString baseName = QFileInfo(outputFile).fileName(); const QString baseName = QFileInfo(outputFile).fileName();
@ -130,9 +133,9 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
{ {
bool ok = false; bool ok = false;
int progress = regExp_pass1.cap(1).toInt(&ok); int progress = regExp_pass1.cap(1).toInt(&ok);
if(ok && metaInfo.fileDuration() > 0) if(ok && (fileDuration > 0))
{ {
int newProgress = qRound((static_cast<double>(progress) / static_cast<double>(metaInfo.fileDuration())) * 50.0); int newProgress = qRound((static_cast<double>(progress) / static_cast<double>(fileDuration)) * 50.0);
if(newProgress > prevProgress) if(newProgress > prevProgress)
{ {
emit statusUpdated(newProgress); emit statusUpdated(newProgress);
@ -144,9 +147,9 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
{ {
bool ok = false; bool ok = false;
int progress = regExp_pass2.cap(1).toInt(&ok); int progress = regExp_pass2.cap(1).toInt(&ok);
if(ok && metaInfo.fileDuration() > 0) if(ok && (fileDuration > 0))
{ {
int newProgress = qRound((static_cast<double>(progress) / static_cast<double>(metaInfo.fileDuration())) * 50.0) + 50; int newProgress = qRound((static_cast<double>(progress) / static_cast<double>(fileDuration)) * 50.0) + 50;
if(newProgress > prevProgress) if(newProgress > prevProgress)
{ {
emit statusUpdated(newProgress); emit statusUpdated(newProgress);
@ -158,9 +161,9 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
{ {
bool ok = false; bool ok = false;
int progress = regExp.cap(1).toInt(&ok); int progress = regExp.cap(1).toInt(&ok);
if(ok && metaInfo.fileDuration() > 0) if(ok && (fileDuration > 0))
{ {
int newProgress = qRound((static_cast<double>(progress) / static_cast<double>(metaInfo.fileDuration())) * 100.0); int newProgress = qRound((static_cast<double>(progress) / static_cast<double>(fileDuration)) * 100.0);
if(newProgress > prevProgress) if(newProgress > prevProgress)
{ {
emit statusUpdated(newProgress); emit statusUpdated(newProgress);
@ -257,6 +260,77 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
return true; return true;
} }
unsigned int AACEncoder::detectLength(const QString &sourceFile, volatile bool *abortFlag)
{
unsigned int duration = 0;
QProcess process;
QStringList args;
args << "--i" << sourceFile;
if(!startProcess(process, m_binary_sox, args))
{
return duration;
}
bool bTimeout = false;
bool bAborted = false;
QRegExp regExp("Duration\\s*:\\s*(\\d\\d):(\\d\\d):(\\d\\d)\\.(\\d\\d)", Qt::CaseInsensitive);
while(process.state() != QProcess::NotRunning)
{
if(*abortFlag)
{
process.kill();
bAborted = true;
emit messageLogged("\nABORTED BY USER !!!");
break;
}
process.waitForReadyRead(m_processTimeoutInterval);
if(!process.bytesAvailable() && process.state() == QProcess::Running)
{
process.kill();
qWarning("SoX process timed out <-- killing!");
emit messageLogged("\nPROCESS TIMEOUT !!!");
bTimeout = true;
break;
}
while(process.bytesAvailable() > 0)
{
QByteArray line = process.readLine();
QString text = QString::fromUtf8(line.constData()).simplified();
if(regExp.lastIndexIn(text) >= 0)
{
bool ok[4] = {false, false, false, false};
unsigned int tmp1 = regExp.cap(1).toUInt(&ok[0]);
unsigned int tmp2 = regExp.cap(2).toUInt(&ok[1]);
unsigned int tmp3 = regExp.cap(3).toUInt(&ok[2]);
unsigned int tmp4 = regExp.cap(4).toUInt(&ok[3]);
if(ok[0] && ok[1] && ok[2] && ok[3])
{
duration = (tmp1 * 3600) + (tmp2 * 60) + tmp3 + qRound(static_cast<double>(tmp4) / 100.0);
}
}
if(!text.isEmpty())
{
emit messageLogged(text);
}
}
}
process.waitForFinished();
if(process.state() != QProcess::NotRunning)
{
process.kill();
process.waitForFinished(-1);
}
//qWarning("Duration detected is: %u", duration);
return duration;
}
QString AACEncoder::extension(void) QString AACEncoder::extension(void)
{ {
return "mp4"; return "mp4";
@ -275,7 +349,6 @@ bool AACEncoder::isFormatSupported(const QString &containerType, const QString &
return false; return false;
} }
void AACEncoder::setProfile(int profile) void AACEncoder::setProfile(int profile)
{ {
m_configProfile = profile; m_configProfile = profile;

3
src/Encoder_AAC.h
View File

@ -44,6 +44,9 @@ public:
private: private:
const QString m_binary_enc; const QString m_binary_enc;
const QString m_binary_tag; const QString m_binary_tag;
const QString m_binary_sox;
int m_configProfile; int m_configProfile;
bool m_configEnable2Pass; bool m_configEnable2Pass;
unsigned int detectLength(const QString &sourceFile, volatile bool *abortFlag);
}; };