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

Improved detection of FhgAacEnc add-in + generally improved AAC encoder detection.

Browse Source
This commit is contained in:
LoRd_MuldeR 2016-02-03 20:50:58 +01:00
parent 83243ff8c5
commit eca5a060cf
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Changelog.html
View File

@ -89,6 +89,7 @@
<li>The &quot;Algorithm Quality&quot; slider now also effects the QAAC encoder</li> <li>The &quot;Algorithm Quality&quot; slider now also effects the QAAC encoder</li>
<li>Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0</li>
<li>Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)</li> <li>Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)</li>
<li>Updated FhgAacEnc add-in to &quot;Case&quot; edition (2015-10-24)</li>
<li>Updated ALAC decoder to refalac v1.58 (2016-01-05)</li> <li>Updated ALAC decoder to refalac v1.58 (2016-01-05)</li>
</ul> </ul>
<h2 id="lamexp-v4.13-2015-12-12" class="unnumbered">LameXP v4.13 [2015-12-12]</h2> <h2 id="lamexp-v4.13-2015-12-12" class="unnumbered">LameXP v4.13 [2015-12-12]</h2>

1
doc/Changelog.md
View File

@ -9,6 +9,7 @@
* The "Algorithm Quality" slider now also effects the QAAC encoder * The "Algorithm Quality" slider now also effects the QAAC encoder
* Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0 * Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0
* Updated QAAC add-in to the to QAAC v2.58 (2016-01-05) * Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)
* Updated FhgAacEnc add-in to "Case" edition (2015-10-24)
* Updated ALAC decoder to refalac v1.58 (2016-01-05) * Updated ALAC decoder to refalac v1.58 (2016-01-05)

6
src/Config.h
View File

@ -34,8 +34,8 @@
#define VER_LAMEXP_MINOR_HI 1 #define VER_LAMEXP_MINOR_HI 1
#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 2 #define VER_LAMEXP_PATCH 3
#define VER_LAMEXP_BUILD 1862 #define VER_LAMEXP_BUILD 1864
#define VER_LAMEXP_CONFG 1818 #define VER_LAMEXP_CONFG 1818
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -50,7 +50,7 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define VER_LAMEXP_TOOL_NEROAAC 1540 #define VER_LAMEXP_TOOL_NEROAAC 1540
#define VER_LAMEXP_TOOL_FHGAACENC 20120806 #define VER_LAMEXP_TOOL_FHGAACENC 20151024
#define VER_LAMEXP_TOOL_FDKAACENC 62 #define VER_LAMEXP_TOOL_FDKAACENC 62
#define VER_LAMEXP_TOOL_QAAC 258 #define VER_LAMEXP_TOOL_QAAC 258

2
src/Thread_Initialization.cpp
View File

@ -695,7 +695,7 @@ void InitAacEncTask::initAacEncImpl(const char *const toolName, const char *cons
toolVersion = 0; toolVersion = 0;
for(quint32 i = 0; i < verDigits; i++) for(quint32 i = 0; i < verDigits; i++)
{ {
toolVersion = (toolVersion * verShift) + qBound(0U, tmp[i], (verShift - 1)); toolVersion = (verShift > 0) ? ((toolVersion * verShift) + qBound(0U, tmp[i], (verShift - 1))) : tmp[i];
} }
} }
} }

11
src/Tools.h
View File

@ -119,11 +119,10 @@ aac_encoder_t;
static const aac_encoder_t g_lamexp_aacenc[] = static const aac_encoder_t g_lamexp_aacenc[] =
{ {
{ "NeroAAC", { "neroAacEnc.exe", "neroAacDec.exe", "neroAacTag.exe", NULL }, "-help", lamexp_toolver_neroaac(), 4, 10, "v?.?.?.?", "Package\\s+version:\\s+(\\d)\\.(\\d)\\.(\\d)\\.(\\d)", "Nero\\s+AAC\\s+Encoder" }, { "NeroAAC", { "neroAacEnc.exe", "neroAacDec.exe", "neroAacTag.exe", NULL }, "-help", lamexp_toolver_neroaac(), 4, 10, "v?.?.?.?", "Package\\s+version:\\s+(\\d)\\.(\\d)\\.(\\d)\\.(\\d)", "Nero\\s+AAC\\s+Encoder" },
{ "FhgAacEnc", { "fhgaacenc.exe", "enc_fhgaac.dll", "nsutil.dll", "libmp4v2.dll", "libsndfile-1.dll", NULL }, NULL, lamexp_toolver_fhgaacenc(), 1, 100000000, "????-??-??", "fhgaacenc version (\\d+) by tmkk", NULL }, { "FhgAacEnc", { "fhgaacenc.exe", "enc_fhgaac.dll", "nsutil.dll", "libmp4v2.dll", NULL }, NULL, lamexp_toolver_fhgaacenc(), 2, 0, "????-??-??", "fhgaacenc version (\\d+) by tmkk. Modified by Case (\\d+).", NULL },
{ "FdkAacEnc", { "fdkaac.exe", NULL }, "--help", lamexp_toolver_fdkaacenc(), 3, 10, "v?.?.?", "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)", NULL }, { "FdkAacEnc", { "fdkaac.exe", NULL }, "--help", lamexp_toolver_fdkaacenc(), 3, 10, "v?.?.?", "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)", NULL },
{ "QAAC", { "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, { "QAAC", { "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL },
{ "QAACx64", { "qaac64.exe", "libsoxr64.dll", "libsoxconvolver64.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, { "QAACx64", { "qaac64.exe", "libsoxr64.dll", "libsoxconvolver64.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL },
{ NULL, { NULL }, NULL, 0, 0, 0, NULL, NULL, NULL } { NULL, { NULL }, NULL, 0, 0, 0, NULL, NULL, NULL }
}; };