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

Fix AAC encoding in CBR mode: Don't set the "-2pass" parameter when CBR mode is used, as this will cause the Nero AAC encoder to abort with error.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-03-09 17:40:26 +01:00
parent 078dc62c79
commit 3f40f1ed66
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
doc/Changelog.html
View File

@ -14,7 +14,8 @@
<li>Updated LAME encoder to v3.99.0.14 (2011-02-28), compiled with ICL 12.0.2 <li>Updated LAME encoder to v3.99.0.14 (2011-02-28), compiled with ICL 12.0.2
<li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0 <li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0
<li>Updated MediaInfo to v0.7.42 (2011-03-03), compiled with ICL 12.0.2 and MSVC 9.0 <li>Updated MediaInfo to v0.7.42 (2011-03-03), compiled with ICL 12.0.2 and MSVC 9.0
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Fixed a bug that caused AAC encoding to fail in CBR mode (the "-2pass" parameter was set wrongly)
</ul><br> </ul><br>
<a name="4.00">Changes between v3.18 and v4.00:</a><br><ul> <a name="4.00">Changes between v3.18 and v4.00:</a><br><ul>
@ -36,7 +37,7 @@
<li>Updated MediaInfo to v0.7.41 (2011-01-24), compiled with ICL 11.1.065 <li>Updated MediaInfo to v0.7.41 (2011-01-24), compiled with ICL 11.1.065
<li>Updated SoX to v14.3.1 (2010-04-11), compiled with MSVC 9.0 <li>Updated SoX to v14.3.1 (2010-04-11), compiled with MSVC 9.0
<li>Updated GnuPG to v1.4.11, compiled with GCC 4.5.2 <li>Updated GnuPG to v1.4.11, compiled with GCC 4.5.2
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Removed TAK support for now, as their CloseSource(!) tools don't support Unicode file names yet <li>Removed TAK support for now, as their CloseSource(!) tools don't support Unicode file names yet
<li>Removed Volumax tool, as we are using SoX for normalization from now on <li>Removed Volumax tool, as we are using SoX for normalization from now on
<li>Countless minor fixes and improvements (hopefully not too many regressions ^^) <li>Countless minor fixes and improvements (hopefully not too many regressions ^^)
@ -45,7 +46,7 @@
<a name="3.19">Changes between v3.18 and v3.19:</a><br><ul> <a name="3.19">Changes between v3.18 and v3.19:</a><br><ul>
<li>Updated MediaInfo to v0.7.34 (2010-07-09), compiled with ICL 11.1.065 <li>Updated MediaInfo to v0.7.34 (2010-07-09), compiled with ICL 11.1.065
<li>Updated mpg123 decoder to v1.12.3 (2010-07-11), compiled with GCC 4.6.0 <li>Updated mpg123 decoder to v1.12.3 (2010-07-11), compiled with GCC 4.6.0
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Fixed decoding of certain invalid WavPack files <li>Fixed decoding of certain invalid WavPack files
</ul><br> </ul><br>
@ -56,7 +57,7 @@
<li>Updated MediaInfo to v0.7.32 (2010-05-02), compiled with ICL 11.1.065 <li>Updated MediaInfo to v0.7.32 (2010-05-02), compiled with ICL 11.1.065
<li>Updated mpg123 decoder to v1.12.1 (2010-03-31), compiled with GCC 4.4.4 <li>Updated mpg123 decoder to v1.12.1 (2010-03-31), compiled with GCC 4.4.4
<li>Updated Ogg Vorbis decoder to v1.9.7 (2010-03-29), compiled with MSVC 9.0 <li>Updated Ogg Vorbis decoder to v1.9.7 (2010-03-29), compiled with MSVC 9.0
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
</ul><br> </ul><br>
<a name="3.17">Changes between v3.16 and v3.17:</a><br><ul> <a name="3.17">Changes between v3.16 and v3.17:</a><br><ul>
@ -89,7 +90,7 @@
<li>Updated mpg123 decoder to v1.9.2 (2009-11-20) <li>Updated mpg123 decoder to v1.9.2 (2009-11-20)
<li>Updated MediaInfo to v0.7.25 (2009-11-13), compiled with ICL 11.1.046 <li>Updated MediaInfo to v0.7.25 (2009-11-13), compiled with ICL 11.1.046
<li>Updated AC3Filter Tools to v0.31b (2009-10-01), compiled with ICL 11.1.046 <li>Updated AC3Filter Tools to v0.31b (2009-10-01), compiled with ICL 11.1.046
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Updated JEDI-VCL from v3.38 to v3.39 (2009-11-05) <li>Updated JEDI-VCL from v3.38 to v3.39 (2009-11-05)
<li>Various minor fixes and improvements <li>Various minor fixes and improvements
</ul><br> </ul><br>
@ -101,7 +102,7 @@
<li>Updated AC3Filter Tools to v0.31b (2009-10-01) <li>Updated AC3Filter Tools to v0.31b (2009-10-01)
<li>Updated TAK decoder to v1.1.2 (2009-07-27) <li>Updated TAK decoder to v1.1.2 (2009-07-27)
<li>Updated mpg123 decoder to v1.9.1 (2009-10-09) <li>Updated mpg123 decoder to v1.9.1 (2009-10-09)
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Updated the Splash screen and modified the sound that plays on very first launch <li>Updated the Splash screen and modified the sound that plays on very first launch
<li>Updated JEDI-VCL from v3.34 to v3.38 (2009-08-27) <li>Updated JEDI-VCL from v3.34 to v3.38 (2009-08-27)
<li>Updated GnuPG to v1.4.10 (2009-09-02) <li>Updated GnuPG to v1.4.10 (2009-09-02)
@ -125,7 +126,7 @@
<a name="3.11">Changes between v3.10 and v3.11:</a><br><ul> <a name="3.11">Changes between v3.10 and v3.11:</a><br><ul>
<li>Added options to sort the source files (by title, by filename or by track number) <li>Added options to sort the source files (by title, by filename or by track number)
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Updated mpg123 decoder to v1.8.1 (2009-06-14) <li>Updated mpg123 decoder to v1.8.1 (2009-06-14)
<li>Updated FLAC decoder, now using the ICL 9.1 build of FLAC v1.2.1b <li>Updated FLAC decoder, now using the ICL 9.1 build of FLAC v1.2.1b
<li>Updated MediaInfo to v0.7.17 (statically linked) <li>Updated MediaInfo to v0.7.17 (statically linked)
@ -137,7 +138,7 @@
<li>Added a NSIS-based installer (will be released in addition to the ZIP package) <li>Added a NSIS-based installer (will be released in addition to the ZIP package)
<li>Added support for the TAK lossless audio format <li>Added support for the TAK lossless audio format
<li>Added two new languages: Serbian (Latin) and Ukrainian <li>Added two new languages: Serbian (Latin) and Ukrainian
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Updated MediaInfo to a custom build of v0.7.16 that is statically linked (and removed the DLL) <li>Updated MediaInfo to a custom build of v0.7.16 that is statically linked (and removed the DLL)
<li>Updated mpg123 decoder to v1.8.0 RC-3 (2009-06-03) <li>Updated mpg123 decoder to v1.8.0 RC-3 (2009-06-03)
<li>Updated Musepack decoder to v1.0.0 (2009-04-02) and fixed Musepack VS8 support <li>Updated Musepack decoder to v1.0.0 (2009-04-02) and fixed Musepack VS8 support
@ -166,7 +167,7 @@
<li>Updated Ogg Vorbis encoder to v2.85, libvorbis v1.2.1 RC2, aoTuV b5.61 (2008-12-24) <li>Updated Ogg Vorbis encoder to v2.85, libvorbis v1.2.1 RC2, aoTuV b5.61 (2008-12-24)
<li>Updated mpg123 decoder to v1.6.3 (2008-12-20) <li>Updated mpg123 decoder to v1.6.3 (2008-12-20)
<li>Updated MediaInfo to v0.7.8.0 (2008-12-10) <li>Updated MediaInfo to v0.7.8.0 (2008-12-10)
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
</ul><br> </ul><br>
<a name="3.06">Changes between v3.05 and v3.06:</a><br><ul> <a name="3.06">Changes between v3.05 and v3.06:</a><br><ul>
@ -175,7 +176,7 @@
<li>Added support for the ALAC audio format <li>Added support for the ALAC audio format
<li>Updated MediaInfo to v0.7.7.7 (2008-10-17) <li>Updated MediaInfo to v0.7.7.7 (2008-10-17)
<li>Updated AC3 Filter Tools to v0.2a (2008-06-30) <li>Updated AC3 Filter Tools to v0.2a (2008-06-30)
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Fixed and improved "Normalization" filter <li>Fixed and improved "Normalization" filter
<li>Fixed a few minor bugs <li>Fixed a few minor bugs
</ul><br> </ul><br>
@ -185,7 +186,7 @@
<li>Added option to add an entire directory or an entire directory-tree <li>Added option to add an entire directory or an entire directory-tree
<li>Added new languages: Russian, Nederlands, Greek and Hungarian <li>Added new languages: Russian, Nederlands, Greek and Hungarian
<li>Added Dropbox for improved Drag&amp;Drop support <li>Added Dropbox for improved Drag&amp;Drop support
<li>Updated language files (big "thank you" to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Updated LAME encoder to v3.98.2 Final (2008-09-24) <li>Updated LAME encoder to v3.98.2 Final (2008-09-24)
<li>Updated MediaInfo to v0.7.7.6 (2008-09-12) <li>Updated MediaInfo to v0.7.7.6 (2008-09-12)
</ul><br> </ul><br>

4
src/Config.h
View File

@ -25,8 +25,8 @@
#define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_MINOR_LO 1
#define VER_LAMEXP_BUILD 358 #define VER_LAMEXP_BUILD 360
#define VER_LAMEXP_SUFFIX Beta-6 #define VER_LAMEXP_SUFFIX Beta-8
/* /*
* Tools versions * Tools versions

2
src/Encoder_AAC.cpp
View File

@ -63,7 +63,7 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
args << "-br" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000); args << "-br" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000);
break; break;
case SettingsModel::CBRMode: case SettingsModel::CBRMode:
args << "-cbr" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000) << "-2pass"; args << "-cbr" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000);
break; break;
default: default:
throw "Bad rate-control mode!"; throw "Bad rate-control mode!";