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

Fixed encoding of *non*-Stereo sources with NeroAAC, when "HE-AAC *v2* (SBR+PS)" is selected: NeroAAC fails when using "-hev2" option *and* passing a source that is *not* Stereo, we revert to "-he" in that case.

Browse Source
This commit is contained in:
LoRd_MuldeR 2016-11-12 15:08:03 +01:00
parent 64272450c6
commit f05bc6acfa
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Changelog.html
View File

@ -87,6 +87,7 @@
<li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-2</li> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-2</li>
<li>Fixed the location of temporary intermediate files for SoX-based audio effects</li> <li>Fixed the location of temporary intermediate files for SoX-based audio effects</li>
<li>Fixed embedding of meta tags with OggEnc2 when reading directly from OGG/FLAC input file</li> <li>Fixed embedding of meta tags with OggEnc2 when reading directly from OGG/FLAC input file</li>
<li>Fixed encoding of <em>non</em>-Stereo sources with NeroAAC, when &quot;HE-AAC <em>v2</em> (SBR+PS)&quot; is selected</li>
<li>Enabled the &quot;built-in&quot; resampler for QAAC encoder</li> <li>Enabled the &quot;built-in&quot; resampler for QAAC encoder</li>
<li>The &quot;Algorithm Quality&quot; slider now also affects the QAAC encoder</li> <li>The &quot;Algorithm Quality&quot; slider now also affects the QAAC encoder</li>
<li>Added &quot;AVX&quot; (Advanced Vector Extensions) to CPU feature detection code</li> <li>Added &quot;AVX&quot; (Advanced Vector Extensions) to CPU feature detection code</li>

1
doc/Changelog.md
View File

@ -7,6 +7,7 @@
* Upgraded build environment to Microsoft Visual Studio 2015 with Update-2 * Upgraded build environment to Microsoft Visual Studio 2015 with Update-2
* Fixed the location of temporary intermediate files for SoX-based audio effects * Fixed the location of temporary intermediate files for SoX-based audio effects
* Fixed embedding of meta tags with OggEnc2 when reading directly from OGG/FLAC input file * Fixed embedding of meta tags with OggEnc2 when reading directly from OGG/FLAC input file
* Fixed encoding of *non*-Stereo sources with NeroAAC, when "HE-AAC *v2* (SBR+PS)" is selected
* Enabled the "built-in" resampler for QAAC encoder * Enabled the "built-in" resampler for QAAC encoder
* The "Algorithm Quality" slider now also affects the QAAC encoder * The "Algorithm Quality" slider now also affects the QAAC encoder
* Added "AVX" (Advanced Vector Extensions) to CPU feature detection code * Added "AVX" (Advanced Vector Extensions) to CPU feature detection code

8
src/Encoder_AAC.cpp
View File

@ -180,7 +180,15 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo
args << L1S("-he"); //Forces use of HE AAC profile args << L1S("-he"); //Forces use of HE AAC profile
break; break;
case 3: case 3:
if ((channels == 0) || (channels == 2))
{
args << L1S("-hev2"); //Forces use of HEv2 AAC profile args << L1S("-hev2"); //Forces use of HEv2 AAC profile
}
else
{
emit messageLogged("WARNING: Cannot use HE-AAC v2 (SBR+PS) with Non-Stereo input --> reverting to HE-AAC (SBR)");
args << L1S("-he"); //Forces use of HE AAC profile
}
break; break;
} }