OSDN Git Service

(root) / lamexp / LameXP.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3cf64c)
FLAC binary updated to AVX2.
authorLoRd_MuldeR <mulder2@gmx.de>
Sun, 9 Oct 2022 16:26:56 +0000 (18:26 +0200)
committerLoRd_MuldeR <mulder2@gmx.de>
Sun, 9 Oct 2022 16:26:56 +0000 (18:26 +0200)
LameXP_VS2015.vcxproj patch | blob | history
LameXP_VS2015.vcxproj.filters patch | blob | history
LameXP_VS2017.vcxproj patch | blob | history
LameXP_VS2017.vcxproj.filters patch | blob | history
LameXP_VS2019.vcxproj patch | blob | history
LameXP_VS2019.vcxproj.filters patch | blob | history
res/_ALL.qrc patch | blob | history
res/tools/flac.x64-avx.exe [deleted file] patch | blob | history
res/tools/flac.x64-avx2.exe [new file with mode: 0644] patch | blob
src/Tools.h patch | blob | history

diff --git a/LameXP_VS2015.vcxproj b/LameXP_VS2015.vcxproj
index c9e6802..d18a9a5 100644 (file)
--- a/LameXP_VS2015.vcxproj
+++ b/LameXP_VS2015.vcxproj
@@ -469,7 +469,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx2.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
@@ -1569,7 +1569,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x64-avx.qrc">
+    <CustomBuild Include="res\Tools.flac-x64-avx2.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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
diff --git a/LameXP_VS2015.vcxproj.filters b/LameXP_VS2015.vcxproj.filters
index b067a41..1758b50 100644 (file)
--- a/LameXP_VS2015.vcxproj.filters
+++ b/LameXP_VS2015.vcxproj.filters
@@ -412,7 +412,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.dcaenc.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-sse2.cpp">
@@ -914,7 +914,7 @@
     <CustomBuild Include="res\Tools.dcaenc.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x64-avx.qrc">
+    <CustomBuild Include="res\Tools.flac-x64-avx2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.flac-x64-sse2.qrc">
diff --git a/LameXP_VS2017.vcxproj b/LameXP_VS2017.vcxproj
index 4aef58e..afb1732 100644 (file)
--- a/LameXP_VS2017.vcxproj
+++ b/LameXP_VS2017.vcxproj
@@ -475,7 +475,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\v141_xp\Shared\plugins\imageformats
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx2.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
@@ -1575,7 +1575,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\v141_xp\Shared\plugins\imageformats
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x64-avx.qrc">
+    <CustomBuild Include="res\Tools.flac-x64-avx2.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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
diff --git a/LameXP_VS2017.vcxproj.filters b/LameXP_VS2017.vcxproj.filters
index b067a41..1758b50 100644 (file)
--- a/LameXP_VS2017.vcxproj.filters
+++ b/LameXP_VS2017.vcxproj.filters
@@ -412,7 +412,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.dcaenc.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-sse2.cpp">
@@ -914,7 +914,7 @@
     <CustomBuild Include="res\Tools.dcaenc.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x64-avx.qrc">
+    <CustomBuild Include="res\Tools.flac-x64-avx2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.flac-x64-sse2.qrc">
diff --git a/LameXP_VS2019.vcxproj b/LameXP_VS2019.vcxproj
index f4e1e4d..e588f79 100644 (file)
--- a/LameXP_VS2019.vcxproj
+++ b/LameXP_VS2019.vcxproj
@@ -473,7 +473,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx2.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
@@ -1573,7 +1573,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x64-avx.qrc">
+    <CustomBuild Include="res\Tools.flac-x64-avx2.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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
diff --git a/LameXP_VS2019.vcxproj.filters b/LameXP_VS2019.vcxproj.filters
index b067a41..1758b50 100644 (file)
--- a/LameXP_VS2019.vcxproj.filters
+++ b/LameXP_VS2019.vcxproj.filters
@@ -412,7 +412,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.dcaenc.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-sse2.cpp">
@@ -914,7 +914,7 @@
     <CustomBuild Include="res\Tools.dcaenc.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x64-avx.qrc">
+    <CustomBuild Include="res\Tools.flac-x64-avx2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.flac-x64-sse2.qrc">
diff --git a/res/_ALL.qrc b/res/_ALL.qrc
index 009c51a..61bb5a6 100644 (file)
--- a/res/_ALL.qrc
+++ b/res/_ALL.qrc
@@ -226,7 +226,7 @@
     <file>tools/dcaenc.exe</file>
     <file>tools/faad.i686.exe</file>
     <file>tools/faad.sse2.exe</file>
-    <file>tools/flac.x64-avx.exe</file>
+    <file>tools/flac.x64-avx2.exe</file>
     <file>tools/flac.x64-sse2.exe</file>
     <file>tools/flac.x86-i686.exe</file>
     <file>tools/flac.x86-sse2.exe</file>
diff --git a/res/tools/flac.x64-avx.exe b/res/tools/flac.x64-avx.exe
deleted file mode 100644 (file)
index 5d37bf2..0000000
Binary files a/res/tools/flac.x64-avx.exe and /dev/null differ
diff --git a/res/tools/flac.x64-avx2.exe b/res/tools/flac.x64-avx2.exe
new file mode 100644 (file)
index 0000000..e8d5d3c
Binary files /dev/null and b/res/tools/flac.x64-avx2.exe differ
diff --git a/src/Tools.h b/src/Tools.h
index cb36532..7ac7f22 100644 (file)
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -73,7 +73,7 @@ g_lamexp_tools[] =
        {"2be56e43b0959b210b7773bcb1766c6e671b5b82b5366e2146867a6db146897f5fa29a4479395525c44f74763a5861a1", CPU_TYPE_X86_GEN, "flac.x86-i686.exe", 141, ""},
        {"60ab6639a01b89dd484c62edc7c14ab154b202b60dd144a8ade33d07c85cd7163fe14e6881d3836152dcef04cea0254e", CPU_TYPE_X86_SSX, "flac.x86-sse2.exe", 141, ""},
        {"2079fe1e027ac896735d845f9e7ceb9c556a8c9d243fd5fabf1b818da2c849689c4c18324d8990c071746b05e16edcd1", CPU_TYPE_X64_SSE, "flac.x64-sse2.exe", 141, ""},
-       {"7bb28075a9a06f1702f45547189278db39c3720f13b130005092a7904a582f40661fb3076082af00fb82548d39706676", CPU_TYPE_X64_AVX, "flac.x64-avx.exe",  141, ""},
+       {"05b06d38143752de9dad4c2189e6fd466e1a8fba4445163df32a1666ed382d54c9b970d051da3f519b3757cead1c5307", CPU_TYPE_X64_AVX, "flac.x64-avx2.exe", 141, ""},
        {"657320078375a5392e2f9351f2b375b5b3fd9c7ab5e00d0d1f00e58af2405f9f9278078b17959f1d547d4c1b816b0b67", CPU_TYPE_X86_GEN, "lame.x86-i686.exe", 31001, "SVN"},
        {"d26a917f5cd1b29bb10810d85e4f979e3fd58d9c4957990badd35a57bc6936b02d78c0096094e7906c8288f66b79bb8b", CPU_TYPE_X86_SSX, "lame.x86-sse2.exe", 31001, "SVN"},
        {"b76d98075dac1a18675d837aea4051a9a71406af4636a41f0a8923beaf0d299de3ad51a6d80275a878849a63de16e90a", CPU_TYPE_X64_SSE, "lame.x64-sse2.exe", 31001, "SVN" },
LameXP development repository
About OSDN
Find Software
Develop Software
Help