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

Updated Monkey's Audio binaries to v4.25 (2017-03-12), compiled with ICL 17.0 and MSVC 14.0.

Browse Source
This commit is contained in:
LoRd_MuldeR 2017-04-27 19:53:08 +02:00
parent bbbc4cdb27
commit fcaf6f6081
12 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
LameXP_VS2013.vcxproj
View File

@ -423,6 +423,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
<ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-sse2.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-sse2.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i686.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i686.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-sse2.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-sse2.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.mac-avx.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.mac-i686.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i686.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.mac-sse2.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.mac-sse2.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i686.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i686.cpp" />
@ -1859,6 +1860,18 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild> </CustomBuild>
<CustomBuild Include="res\Tools.mac-avx.qrc">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="LameXP.rc"> <ResourceCompile Include="LameXP.rc">

6
LameXP_VS2013.vcxproj.filters
View File

@ -559,6 +559,9 @@
<ClCompile Include="tmp\LameXP\QRC_Tools.sox-sse2.cpp"> <ClCompile Include="tmp\LameXP\QRC_Tools.sox-sse2.cpp">
<Filter>Generated Files\QRC</Filter> <Filter>Generated Files\QRC</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="tmp\LameXP\QRC_Tools.mac-avx.cpp">
<Filter>Generated Files\QRC</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\Config.h"> <ClInclude Include="src\Config.h">
@ -1049,6 +1052,9 @@
<CustomBuild Include="res\Tools.sox-i686.qrc"> <CustomBuild Include="res\Tools.sox-i686.qrc">
<Filter>Resources</Filter> <Filter>Resources</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="res\Tools.mac-avx.qrc">
<Filter>Resources</Filter>
</CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="ReadMe.txt" /> <None Include="ReadMe.txt" />

13
LameXP_VS2015.vcxproj
View File

@ -423,6 +423,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
<ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-sse2.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-sse2.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i686.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i686.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-sse2.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-sse2.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.mac-avx.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.mac-i686.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i686.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.mac-sse2.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.mac-sse2.cpp" />
<ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i686.cpp" /> <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i686.cpp" />
@ -1859,6 +1860,18 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild> </CustomBuild>
<CustomBuild Include="res\Tools.mac-avx.qrc">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="LameXP.rc"> <ResourceCompile Include="LameXP.rc">

6
LameXP_VS2015.vcxproj.filters
View File

@ -559,6 +559,9 @@
<ClCompile Include="tmp\LameXP\QRC_Tools.sox-sse2.cpp"> <ClCompile Include="tmp\LameXP\QRC_Tools.sox-sse2.cpp">
<Filter>Generated Files\QRC</Filter> <Filter>Generated Files\QRC</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="tmp\LameXP\QRC_Tools.mac-avx.cpp">
<Filter>Generated Files\QRC</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\Config.h"> <ClInclude Include="src\Config.h">
@ -1049,6 +1052,9 @@
<CustomBuild Include="res\Tools.sox-i686.qrc"> <CustomBuild Include="res\Tools.sox-i686.qrc">
<Filter>Resources</Filter> <Filter>Resources</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="res\Tools.mac-avx.qrc">
<Filter>Resources</Filter>
</CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="ReadMe.txt" /> <None Include="ReadMe.txt" />

2
doc/Changelog.html
View File

File diff suppressed because one or more lines are too long

2
doc/Changelog.md
View File

@ -6,6 +6,7 @@ LameXP Audio-Encoder Front-End &ndash; Changelog
# LameXP v4.xx History # # LameXP v4.xx History #
## LameXP v4.15 [2017-??-??] ## {-} ## LameXP v4.15 [2017-??-??] ## {-}
* Fixed a bug in auto-rename feature, that caused problems when a meta-tag contained path separators * Fixed a bug in auto-rename feature, that caused problems when a meta-tag contained path separators
* Fixed included MediaInfo binary not working on processor *without* SSE2 support * Fixed included MediaInfo binary not working on processor *without* SSE2 support
* Improved file name generation from meta-tags containing characters that are forbidden in file names * Improved file name generation from meta-tags containing characters that are forbidden in file names
@ -15,6 +16,7 @@ LameXP Audio-Encoder Front-End &ndash; Changelog
* Updated SoX to v14.4.2 (2015-02-22) with Dynamic Audio Normalizer v2.10 (2017-04-14) effect included * Updated SoX to v14.4.2 (2015-02-22) with Dynamic Audio Normalizer v2.10 (2017-04-14) effect included
* Updated mpg123 decoder to v1.24.0 (2017-03-02), compiled with GCC 6.3.0 * Updated mpg123 decoder to v1.24.0 (2017-03-02), compiled with GCC 6.3.0
* Updated FAAD decoder to v2.7 from CVS in order to include latest libFAAD fixes (2016-11-11) * Updated FAAD decoder to v2.7 from CVS in order to include latest libFAAD fixes (2016-11-11)
* Updated Monkey's Audio binary to v4.25 (2017-03-12), compiled with ICL 17.0 and MSVC 14.0
* Some tweaks to the auto-update function in order to speed-up the update check in most situations * Some tweaks to the auto-update function in order to speed-up the update check in most situations
## LameXP v4.14 [2016-11-19] ## {-} ## LameXP v4.14 [2016-11-19] ## {-}

BIN
res/tools/mac.avx.exe Normal file
View File

Binary file not shown.

BIN
res/tools/mac.i686.exe
View File

Binary file not shown.

BIN
res/tools/mac.sse2.exe
View File

Binary file not shown.

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 5 #define VER_LAMEXP_MINOR_LO 5
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 5 #define VER_LAMEXP_PATCH 5
#define VER_LAMEXP_BUILD 1987 #define VER_LAMEXP_BUILD 1989
#define VER_LAMEXP_CONFG 1934 #define VER_LAMEXP_CONFG 1934
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

15
src/Thread_Initialization.cpp
View File

@ -60,7 +60,6 @@ static const bool ENABLE_CUSTOM_TOOLS = true;
/* constants */ /* constants */
static const double g_allowedExtractDelay = 12.0; static const double g_allowedExtractDelay = 12.0;
static const size_t BUFF_SIZE = 512; static const size_t BUFF_SIZE = 512;
static const size_t EXPECTED_TOOL_COUNT = 29;
/* number of CPU cores -> number of threads */ /* number of CPU cores -> number of threads */
static unsigned int cores2threads(const unsigned int cores) static unsigned int cores2threads(const unsigned int cores)
@ -405,7 +404,7 @@ double InitializationThread::doInit(const size_t threadCount)
QDir appDir = QDir(QCoreApplication::applicationDirPath()).canonicalPath(); QDir appDir = QDir(QCoreApplication::applicationDirPath()).canonicalPath();
QScopedPointer<QThreadPool> pool(new QThreadPool()); QScopedPointer<QThreadPool> pool(new QThreadPool());
pool->setMaxThreadCount((threadCount > 0) ? threadCount : qBound(2U, cores2threads(m_cpuFeatures.count), EXPECTED_TOOL_COUNT)); pool->setMaxThreadCount((threadCount > 0) ? threadCount : qBound(2U, cores2threads(m_cpuFeatures.count), 16U));
ExtractorTask::clearFlags(); ExtractorTask::clearFlags();
//Start the timer //Start the timer
@ -722,6 +721,7 @@ void InitializationThread::selfTest(void)
{ {
const unsigned int cpu[7] = {CPU_TYPE_X86_GEN, CPU_TYPE_X86_SSE, CPU_TYPE_X86_AVX, CPU_TYPE_X64_GEN, CPU_TYPE_X64_SSE, CPU_TYPE_X64_AVX, 0 }; const unsigned int cpu[7] = {CPU_TYPE_X86_GEN, CPU_TYPE_X86_SSE, CPU_TYPE_X86_AVX, CPU_TYPE_X64_GEN, CPU_TYPE_X64_SSE, CPU_TYPE_X64_AVX, 0 };
unsigned int expectedCount = UINT_MAX;
for(size_t k = 0; cpu[k]; k++) for(size_t k = 0; cpu[k]; k++)
{ {
qDebug("[TEST]"); qDebug("[TEST]");
@ -770,9 +770,16 @@ void InitializationThread::selfTest(void)
qFatal("Inconsistent checksum data detected. Take care!"); qFatal("Inconsistent checksum data detected. Take care!");
} }
} }
if(n != EXPECTED_TOOL_COUNT) if (expectedCount != UINT_MAX)
{ {
qFatal("Tool count mismatch for CPU type %u. Should be %u, but got %u !!!", cpu[k], EXPECTED_TOOL_COUNT, n); if (n != expectedCount)
{
qFatal("Tool count mismatch for CPU type %u. Should be %u, but got %u !!!", cpu[k], expectedCount, n);
}
}
else
{
expectedCount = n; /*remember count*/
} }
qDebug("Done.\n"); qDebug("Done.\n");
} }

5
src/Tools.h
View File

@ -83,8 +83,9 @@ g_lamexp_tools[] =
{"afb30a68e12ab2647f9694eb51d3b22d0f3cef95deda811c714556203dcc0adbe4b18c406c6af67b0d4af09f5033c77b", CPU_TYPE_X86_SSX, "lame.x86-sse2.exe", 31002, "Alpha"}, {"afb30a68e12ab2647f9694eb51d3b22d0f3cef95deda811c714556203dcc0adbe4b18c406c6af67b0d4af09f5033c77b", CPU_TYPE_X86_SSX, "lame.x86-sse2.exe", 31002, "Alpha"},
{"84b66be0c17ff9b642fdb7f04f26c6621381a02b6297d17b36c9c6afa308b72f1dacb3831b41affe56db6b7fb5dbe9ae", CPU_TYPE_X64_NVX, "lame.x64-sse2.exe", 31002, "Alpha" }, {"84b66be0c17ff9b642fdb7f04f26c6621381a02b6297d17b36c9c6afa308b72f1dacb3831b41affe56db6b7fb5dbe9ae", CPU_TYPE_X64_NVX, "lame.x64-sse2.exe", 31002, "Alpha" },
{"7c8ff93f3c3d89abd36770066c6f2b44f4aecc672e24406991f4035720a42aee2838b4625f9838e088ba05e3cda42d77", CPU_TYPE_X64_AVX, "lame.x64-avx.exe", 31002, "Alpha" }, {"7c8ff93f3c3d89abd36770066c6f2b44f4aecc672e24406991f4035720a42aee2838b4625f9838e088ba05e3cda42d77", CPU_TYPE_X64_AVX, "lame.x64-avx.exe", 31002, "Alpha" },
{"51af33a33bd9bde6ca6e9c612346b9c138584de59a92bc14a680729066fd849fd83fe668f79e2a06ffe117f39993d10a", CPU_TYPE_ALL_GEN, "mac.i686.exe", 416, ""}, {"83a04d781f35015b86a048cca6bde2f4e070d8f2ad60ab8925e6f74c63ce0f49e8cc1552814c222b110591746621b229", CPU_TYPE_ALL_GEN, "mac.i686.exe", 425, ""},
{"117e60cf4445cec0a777d2636091a13c50be5c6ed28afaa75ab09ab4576942f1a8584b36d3abac9db7595dfb0d90207e", CPU_TYPE_ALL_SSX, "mac.sse2.exe", 416, ""}, {"0b3c7a9d9f5c6377abcffad09330ee5cbff848ff7d237c16799da383165ca5d512ca66443a5d33eb7b6bb98c025b7056", CPU_TYPE_ALL_SSE, "mac.sse2.exe", 425, ""},
{"c10298c7ca1b240df05dc88e829a196cb9f37a10824f4c3287a81d21eb134fc0e2b150ed42d7d36d3c6558cba486559a", CPU_TYPE_ALL_AVX, "mac.avx.exe", 425, ""},
{"872f9dd60c993f12e69741a1ad2ac2b389f40cdb0be65b21ead42c048eda55fe1bec454336227b7bc1230639b15daa1a", CPU_TYPE_X86_GEN, "mediainfo.i686.exe", 794, ""}, {"872f9dd60c993f12e69741a1ad2ac2b389f40cdb0be65b21ead42c048eda55fe1bec454336227b7bc1230639b15daa1a", CPU_TYPE_X86_GEN, "mediainfo.i686.exe", 794, ""},
{"ca4942a66ebe0c4aec77cbbb7a4190ecb875a2e5ac66f31581b903d681aaa17eada69aa0dc04ffe2daf5033f6158f350", CPU_TYPE_X86_SSX, "mediainfo.sse2.exe", 794, ""}, {"ca4942a66ebe0c4aec77cbbb7a4190ecb875a2e5ac66f31581b903d681aaa17eada69aa0dc04ffe2daf5033f6158f350", CPU_TYPE_X86_SSX, "mediainfo.sse2.exe", 794, ""},
{"41b2445e7ebd360c8a33cc494946e163ace873f3ba2930fba02f1b3aef66830a85c244f76277ee6d9b45dd81d70aff6f", CPU_TYPE_X64_ALL, "mediainfo.x64.exe", 794, ""}, {"41b2445e7ebd360c8a33cc494946e163ace873f3ba2930fba02f1b3aef66830a85c244f76277ee6d9b45dd81d70aff6f", CPU_TYPE_X64_ALL, "mediainfo.x64.exe", 794, ""},