diff --git a/etc/Deployment/make.bat b/etc/Deployment/make.bat index 56d0e2d1..e640bb23 100644 --- a/etc/Deployment/make.bat +++ b/etc/Deployment/make.bat @@ -220,8 +220,11 @@ attrib +R "%OUT_FILE%.exe" "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" cyan "Signing output file..." "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" cyan "===========================================================================\n" -"%~dp0\..\..\..\Prerequisites\GnuPG\bin\gpg.exe" --detach-sign "%OUT_FILE%.exe" +"%~dp0\..\..\..\Prerequisites\GnuPG\bin\gpg.exe" -u 0x6CF3FA22 -a -o "%OUT_FILE%.exe.sig" --detach-sign "%OUT_FILE%.exe" +"%~dp0\..\..\..\Prerequisites\GnuPG\bin\gpg.exe" -u 0x5F57E03F -a -o "%OUT_FILE%.exe.sig2" --detach-sign "%OUT_FILE%.exe" + attrib +R "%OUT_FILE%.exe.sig" +attrib +R "%OUT_FILE%.exe.sig2" :: --------------------------------------------------------------------------- :: COMPLETED diff --git a/etc/Patches/OpusTools-v0.1.9-Progress+NoResample.V5.diff b/etc/Patches/OpusTools-v0.1.10-Progress+NoResample.V7.diff similarity index 85% rename from etc/Patches/OpusTools-v0.1.9-Progress+NoResample.V5.diff rename to etc/Patches/OpusTools-v0.1.10-Progress+NoResample.V7.diff index 83be0837..28fbae00 100644 --- a/etc/Patches/OpusTools-v0.1.9-Progress+NoResample.V5.diff +++ b/etc/Patches/OpusTools-v0.1.10-Progress+NoResample.V7.diff @@ -1,12 +1,11 @@ src/opusdec.c | 24 +++++++++++++++++++++--- src/opusenc.c | 18 ++++++++---------- - win32/config.h | 10 +++++++++- + win32/config.h | 16 +++++++++++++++- win32/genversion.bat | 1 + - win32/version.h | 12 +++++++++++- - 5 files changed, 50 insertions(+), 15 deletions(-) + 4 files changed, 45 insertions(+), 14 deletions(-) diff --git a/src/opusdec.c b/src/opusdec.c -index d085f04..92027fe 100644 +index 7e51f7a..cced424 100644 --- a/src/opusdec.c +++ b/src/opusdec.c @@ -53,6 +53,7 @@ @@ -85,7 +84,7 @@ index d085f04..92027fe 100644 last_spin++; last_coded_seconds=coded_seconds; diff --git a/src/opusenc.c b/src/opusenc.c -index 5f89d8a..52a080c 100644 +index 129dcdb..43b7273 100644 --- a/src/opusenc.c +++ b/src/opusenc.c @@ -41,6 +41,7 @@ @@ -96,7 +95,7 @@ index 5f89d8a..52a080c 100644 #ifdef _MSC_VER #define snprintf _snprintf -@@ -1031,6 +1032,7 @@ int main(int argc, char **argv) +@@ -1032,6 +1033,7 @@ int main(int argc, char **argv) double estbitrate; double coded_seconds=nb_encoded/(double)coding_rate; double wall_time=(stop_time-start_time)+1e-6; @@ -104,7 +103,7 @@ index 5f89d8a..52a080c 100644 char sbuf[55]; static const char spinner[]="|/-\\"; if(!with_hard_cbr){ -@@ -1038,20 +1040,16 @@ int main(int argc, char **argv) +@@ -1039,20 +1041,16 @@ int main(int argc, char **argv) estbitrate=(total_bytes*8.0/coded_seconds)*tweight+ bitrate*(1.-tweight); }else estbitrate=nbBytes*8*((double)coding_rate/frame_size); @@ -132,10 +131,10 @@ index 5f89d8a..52a080c 100644 fprintf(stderr,"%s",sbuf); fflush(stderr); diff --git a/win32/config.h b/win32/config.h -index 5a1e250..1090a9f 100644 +index 76d34b6..d8f0fa7 100644 --- a/win32/config.h +++ b/win32/config.h -@@ -10,7 +10,15 @@ +@@ -10,7 +10,21 @@ #define USE_ALLOCA 1 #define FLOATING_POINT 1 #define SPX_RESAMPLE_EXPORT @@ -145,37 +144,26 @@ index 5a1e250..1090a9f 100644 +#if defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1)) +#define __SSE__ 1 +#endif -+ +#if defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)) +#define __SSE2__ 1 ++#endif ++ ++#ifdef __SSE__ ++#pragma message( "SSE code is enabled!" ) ++#endif ++#ifdef __SSE2__ ++#pragma message( "SSE2 code is enabled!" ) +#endif - #define RANDOM_PREFIX foo + #define RANDOM_PREFIX opustools diff --git a/win32/genversion.bat b/win32/genversion.bat -index 44ba29c..e94e8ea 100644 +index 1def746..64b0a5e 100644 --- a/win32/genversion.bat +++ b/win32/genversion.bat @@ -1,4 +1,5 @@ @echo off +goto:eof - for /f %%v in ('git describe --tags --match "v*" --always') do set version=%%v + setlocal enableextensions enabledelayedexpansion -diff --git a/win32/version.h b/win32/version.h -index 3c8a521..c05f50f 100644 ---- a/win32/version.h -+++ b/win32/version.h -@@ -1 +1,11 @@ --#define PACKAGE_VERSION "v0.1.9-dev" -+#define __PACKAGE_VERSION "v0.1.9-git" -+ -+#if defined(__AVX__) && __AVX__ -+#define PACKAGE_VERSION __PACKAGE_VERSION " AVX1 [" __DATE__ "]" -+#else -+#if defined(__SSE__) && __SSE__ -+#define PACKAGE_VERSION __PACKAGE_VERSION " SSE2 [" __DATE__ "]" -+#else -+#define PACKAGE_VERSION __PACKAGE_VERSION " IA32 [" __DATE__ "]" -+#endif -+#endif diff --git a/res/tools/opusdec.avx.exe b/res/tools/opusdec.avx.exe index 79355b97..696b14b2 100644 Binary files a/res/tools/opusdec.avx.exe and b/res/tools/opusdec.avx.exe differ diff --git a/res/tools/opusdec.i686.exe b/res/tools/opusdec.i686.exe index c6cbb437..ebb36daa 100644 Binary files a/res/tools/opusdec.i686.exe and b/res/tools/opusdec.i686.exe differ diff --git a/res/tools/opusdec.sse2.exe b/res/tools/opusdec.sse2.exe index d5cc91e2..7b020795 100644 Binary files a/res/tools/opusdec.sse2.exe and b/res/tools/opusdec.sse2.exe differ diff --git a/res/tools/opusenc.avx.exe b/res/tools/opusenc.avx.exe index 05a92304..20fa9121 100644 Binary files a/res/tools/opusenc.avx.exe and b/res/tools/opusenc.avx.exe differ diff --git a/res/tools/opusenc.i686.exe b/res/tools/opusenc.i686.exe index db20423c..2044fed9 100644 Binary files a/res/tools/opusenc.i686.exe and b/res/tools/opusenc.i686.exe differ diff --git a/res/tools/opusenc.sse2.exe b/res/tools/opusenc.sse2.exe index 569df6f8..700baf61 100644 Binary files a/res/tools/opusenc.sse2.exe and b/res/tools/opusenc.sse2.exe differ diff --git a/src/Config.h b/src/Config.h index a60eb1cf..1bbd7b46 100644 --- a/src/Config.h +++ b/src/Config.h @@ -34,8 +34,8 @@ #define VER_LAMEXP_MINOR_HI 1 #define VER_LAMEXP_MINOR_LO 5 #define VER_LAMEXP_TYPE RC -#define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 2000 +#define VER_LAMEXP_PATCH 2 +#define VER_LAMEXP_BUILD 2001 #define VER_LAMEXP_CONFG 1934 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Tools.h b/src/Tools.h index 6706788d..a2504687 100644 --- a/src/Tools.h +++ b/src/Tools.h @@ -98,12 +98,12 @@ g_lamexp_tools[] = {"245181321625445ac42fce31d64bf03872e77e2d0dd3c19d6c17ca2771354f096a6040827dd6d00ffd7342c7dd26168e", CPU_TYPE_X86_GEN, "oggenc2.i686.exe", 288135603, "2015"}, {"512b8efcd1003a0f67220a450d6ea4466194e8fd49fc090a69b15a858db11499acbf98f984530cd5d37b4b6abdd1c6d8", CPU_TYPE_X86_SSX, "oggenc2.sse2.exe", 288135603, "2015"}, {"a07ef67cba5a00d335d07372baf76d4d0573b425afce71a19c1e04eaabbe3f55e60bdd40af5e428224c91df1823eda08", CPU_TYPE_X64_ALL, "oggenc2.x64.exe", 288135603, "2015"}, - {"3be27533e6bb2dc2e0abc85d0a1ead66dc75daea029dc9cc14c9064a5c304feffb72d1d042e3959548443c7dfdeec347", CPU_TYPE_ALL_GEN, "opusdec.i686.exe", 20170506, "v1.2-alpha2"}, - {"5169d70589b0e20572b3f3f56290aa9a86a14af84ebb32bf10444f12157abf747c7791f0be4770a7f7693c8e743d5ae9", CPU_TYPE_ALL_SSE, "opusdec.sse2.exe", 20170506, "v1.2-alpha2"}, - {"66ffa2a1bc340b5a95ebe04df199090af41c717c7f2a8965044dc683a7b463859a7f6f91e78f04d85653b4277c232fe3", CPU_TYPE_ALL_AVX, "opusdec.avx.exe", 20170506, "v1.2-alpha2"}, - {"aca8753bd7644c9460297d8978d4442e75fe8874182d879e59849db148dd2f90a88f7613dd95a836f3b5f677af1c3e73", CPU_TYPE_ALL_GEN, "opusenc.i686.exe", 20170506, "v1.2-alpha2"}, - {"5f3f5ea80add8a7bd6c6cd9535363d09c26bbc02a498834440547eb404585be844d13808c6d2cc1d12f7e014b3bce706", CPU_TYPE_ALL_SSE, "opusenc.sse2.exe", 20170506, "v1.2-alpha2"}, - {"b1e5ad4a1940cd4b37dffc4e87d2b8f07b2fbc04aaa52b1d2f619f0907745114d234d2b30db80ef5b3b90d964ee94d6b", CPU_TYPE_ALL_AVX, "opusenc.avx.exe", 20170506, "v1.2-alpha2"}, + {"6d1b61da6fea42d2c558ba4be4ef3cd131e90913fb3e75be9571b78f5d7ae44dc8ce0272f9b59bc6b066d1c23daa1402", CPU_TYPE_ALL_GEN, "opusdec.i686.exe", 20170506, "v1.2-beta"}, + {"72e58ba7f076bced37458652ae67b12355c7eea49a387cb027ea7235e9d6d0eab672d2665d628230695329db816817f6", CPU_TYPE_ALL_SSE, "opusdec.sse2.exe", 20170506, "v1.2-beta"}, + {"188e955fe6355d6beb81a36b22f224bd6c6aa32f3eab15d48efd6ee47f006e7f27b29165d59117ccd3560b176937feb1", CPU_TYPE_ALL_AVX, "opusdec.avx.exe", 20170506, "v1.2-beta"}, + {"da0d2994c4ab53e6f7674e74007aadef0f8cfb41fe9675540f1c788f909d62b3ae57f65ef1729e3b256a76b07da8cc54", CPU_TYPE_ALL_GEN, "opusenc.i686.exe", 20170506, "v1.2-beta"}, + {"302363eb7524ae6f02d58bef0c4d64183f251665f0d19328c4f7241b1204e30e14ed310f2b296e43af2ddaef7fb56fc7", CPU_TYPE_ALL_SSE, "opusenc.sse2.exe", 20170506, "v1.2-beta"}, + {"3ab9fb086b79eb0cd53dbfab5cf6ce766108fff7cb0ad709e15903f02d71faf859e93570339ba8fa53a226ca582a1d27", CPU_TYPE_ALL_AVX, "opusenc.avx.exe", 20170506, "v1.2-beta"}, {"37745174e146fedbc62671ab86ffddd3edfc9aa0ebfcfd4bff3331a95b6dda50621478c63f7a0ddf9a365e916758b6d4", CPU_TYPE_X86_ALL, "refalac.i686.exe", 161, ""}, {"b368f0490cefb80b6ff7eaaf8d6e29f253442375caf11a9405b5b21580ee3a9739fa3f406f69de5ef344fa038b1cbe72", CPU_TYPE_X64_ALL, "refalac.x64.exe", 161, ""}, {"d041b60de6c5c6e77cbad84440db57bbeb021af59dd0f7bebd3ede047d9e2ddc2a0c14179472687ba91063743d23e337", CPU_TYPE_ALL_ALL, "shorten.exe", 361, ""},