Updated mpg123 decoder binary to v1.22.2 (2015-05-24), compiled with GCC 5.1.0.

[lamexp/LameXP.git] / src / Tools.h

diff --git a/src/Tools.h b/src/Tools.h
index 685dcf1..810ec64 100644 (file)
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -22,6 +22,10 @@
 
 #include <stdlib.h>
 
+#ifndef LAMEXP_INC_TOOLS
+#error Please do *not* include TOOLS.H directly!
+#endif
+
 ////////////////////////////////////////////////////////////
 // CPU FLags
 ////////////////////////////////////////////////////////////
@@ -60,34 +64,62 @@ g_lamexp_tools[] =
        {"07834b1b8ecac2f3db79ad048005eca3a284cb759e15d399eb1a560a403122e20db5f08e60319759b8463aeef2410d02", CPU_TYPE_ALL_ALL, "dcaenc.exe", 20120419, ""},
        {"7c249f507b96967bedabdd7e631638807a7595ebff58eaaadf63530783d515eda9660bc2b1a0457fddae7e3eaef8a074", CPU_TYPE_ALL_ALL, "elevator.exe", UINT_MAX, ""},
        {"bbc262cfe9c48633e5f1780d30347d7663075cfd7bdc76347cce3b1191d62f788d9b91bc63dffae2f66d1759d5849e92", CPU_TYPE_ALL_ALL, "faad.exe", 27, ""},
-       {"1f596224564452e66d0c717dfd776d0c4fa4fcc8650a424895a780b19d7acc8c8fb0f5c0501f2adfabc8a96da6074529", CPU_TYPE_ALL_ALL, "flac.exe", 130, ""},
-       {"1633edab399014426b88da1bdf07b35ec7524303bcc972f7bcb4d86d06c6e808b840f2be63f105f0adfcc9116decc06a", CPU_TYPE_ALL_ALL, "gpgv.exe", 1416, ""},
+       {"36f9b021a8136664fce4c556571270f9151ca11d191b31630b0cad7b28107be2175909b8d28c903cb1c17d260c38d5de", CPU_TYPE_X86_ALL, "flac.i386.exe", 131, ""},
+       {"68e08fc34f981d183f243308791b5e158c28903a2052ca239bb9ad3d54d976c9ec7f0bb0b50c0aadfcefb4a1d0f63a18", CPU_TYPE_X64_ALL, "flac.x64.exe" , 131, ""},
+       {"9d2008d06b731b0d88377e9b2ceda30826ee787fe09ae8ef98084d5ef80655199e5069672366314b67a4285b56a282f0", CPU_TYPE_ALL_ALL, "gpgv.exe", 1419, ""},
        {"19c9dbe9089491c1f59ae48016d95d4336c4d3743577db4e782d8b59eca3b2bda6ed8f92f9004f88f434935b79e4974b", CPU_TYPE_ALL_ALL, "gpgv.gpg", UINT_MAX, ""},
        {"53cfab3896a47d48f523315f475fa07856d468ad1aefcc8cce19c18cdf509e2f92840dab92a442995df36d941cb7a6ca", CPU_TYPE_ALL_GEN, "lame.i386.exe", 3995, "Final"},
        {"9511e7ef2ad10de05386eedf7f14d637edab894a53dacd2f8f15c6f8ed582f12c25fb5bf88438e62c46b8eb92e7634b2", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3995, "Final"},
        {"fdbeb978025b9a5345300f37bb56446c31c7db594cf29407afdcc9ce20f4a5cec6eb8c03962c247d4f45b83c465ac705", CPU_TYPE_ALL_ALL, "mac.exe", 412, ""},
-       {"975408454231ac8c51960907a7eea1dd4ef8f7e1269816737e8c072ab695de32d3dae433bc667f8d1343a60e95ddb38d", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 769, ""},
-       {"3c049cb7e149413129cfc17588346bfa455554da6a6aec549a7b8e2a6f0953fa2a7f5d3425e6f41a26ed6b379c514687", CPU_TYPE_X64_ALL, "mediainfo.x64.exe",  769, ""},
+       {"a503572a9fd5e75acfd5e70c8b6618db3076b3a865b9aea34443fccb6c363705b0c392e7fbfd50ba5cbf09b20f4d467a", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 774, ""},
+       {"e25caa6e199a3f5d86b9b2fb5e4bcd369fa67b13b1afad982196b44ae323f55e8729b76a3ad83f97c2575342ac57a013", CPU_TYPE_X64_ALL, "mediainfo.x64.exe",  774, ""},
        {"7e6346a057634ff07b2e1f427035324f7f02100cc996425990f87f71d767fce4c7b101588c7d944ba49cb2d7e51c9bdb", CPU_TYPE_ALL_ALL, "mpcdec.exe", 475, ""},
-       {"96c6e22928f34a514d824f3d6e2fdc2cc1dcfb3e074ab109c989f54654e80c68f5f81648d1eca4199654289fd511df7f", CPU_TYPE_ALL_ALL, "mpg123.exe", 1190, ""},
-       {"82d2f9c1422ecd4faa28eb3e0cb4ead95f35d46e445dbdd4319b1049dd11d37e3620c0e58d5d9c30fbfc3a49bae2d34d", CPU_TYPE_ALL_ALL, "oggdec.exe", 1101, ""},
-       {"88f4bc96d5c2a266e8d054f591ec87e84f0d7253185b86fc49e5375d29ade506b7adfc948314d9b5f424c8b147a7a83a", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 134603, "2014"},
-       {"35a356913c9169c11922e3f96086f38dd742e7d92581af73df17d3f44e99601531f4b9c6bd998d6294a6979fea1c9dba", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 134603, "2014"},
-       {"f4b610769910c4b6e03058c15aa94d964eaec1581aab957234125491ff6f0a2dad51012d9c7bb5a2a80e0d958f160b91", CPU_TYPE_X64_ALL, "oggenc2.x64.exe",  134603, "2014"},
-       {"b8f8167ee344ada98d6cca831145c0f8f97a25875f34f8ee03395a5ac5203bfefca4e472f4c8ae5b9999bd2ded83bd7e", CPU_TYPE_ALL_GEN, "opusdec.i386.exe", 20140413, "v1.1"},
-       {"262549c5f349c984e94451666419eaff4c0f5558719a729568f9131306c6455420d2551c956d8ba2edc2bce533103d8a", CPU_TYPE_ALL_SSE, "opusdec.sse2.exe", 20140413, "v1.1"},
-       {"2127979169db9a1fbfeb71fb88b59f5f85047855b25bb3e5bff6ffadc1bc31a8369cd1902ea9e9efd184a94ce1be92bd", CPU_TYPE_ALL_GEN, "opusenc.i386.exe", 20140413, "v1.1"},
-       {"b38e61a5c1d57f31349d035d3891038a0ca2c9a5a8252e3ae91ad98e23436d7c9c69cedfae26043fadf6ea215b2de5de", CPU_TYPE_ALL_SSE, "opusenc.sse2.exe", 20140413, "v1.1"},
-       {"bdfa8dec142b6327a33af6bb314d7beb924588d1b73f2ef3f46b31fa6046fe2f4e64ca78b025b7eb9290a78320e2aa57", CPU_TYPE_ALL_ALL, "refalac.exe", 56, ""},
+       {"bef99ee932b6da589e502082969285e22e3be03263b75bce7780e31f38e3ec16fad90957157bfd8d39b95aab51be3914", CPU_TYPE_ALL_ALL, "mpg123.exe", 1222, ""},
+       {"f1f2ea5c9e5539620b706e7af68e543bf7a731afb06ccce3815ab34dad64d697e4d6ffcd187a396619b8b52efe7edf88", CPU_TYPE_ALL_ALL, "oggdec.exe", 1101, ""},
+       {"2b85af4919cb8292d6839271109688bb4808d3e2bc6604d9d02cca6b5f2df8d3c0808a3876a4cd75ae973a3b5562beec", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 287134603, "2014"},
+       {"969797f883a41661785f32bc194ca1b91e8e215e69e9d7cf04cbbdf9097719841ac6c449c9b929e310f7eb2905196978", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 287134603, "2014"},
+       {"96c9b445ccd4c5ac32eeb695cbbda9d8f66733db095d8de542e54c3349e69fdca71c56a7f672289a8c72689e3d0e3b32", CPU_TYPE_X64_ALL, "oggenc2.x64.exe",  287134603, "2014"},
+       {"d9949ab989fa412bffb08c47f431b74a66223aa584beb9a6aeaa66885932c2ed251798748cbc489e984f0acce0e0053c", CPU_TYPE_ALL_GEN, "opusdec.i386.exe", 20150326, "v1.1"},
+       {"e3fc96044491bd96734dc25c8fdcb1760ee86a8fd47ad74481999ae18593d0647f0d4a45f058950b9def0903e8a30fc3", CPU_TYPE_ALL_SSE, "opusdec.sse2.exe", 20150326, "v1.1"},
+       {"ae777a525a4670df1deca0483c5087f129d8131eaf946b2cd72fa96ab65db7fb600766448d28caf2102d97b3fa26e6bc", CPU_TYPE_ALL_GEN, "opusenc.i386.exe", 20150326, "v1.1"},
+       {"8eadcdfe01a6ff2d88b6cfdf203c6eae6f858bd17b894644fa1d78d293235d8dc21b0102b8ca3d48f718251b3f2e9e5a", CPU_TYPE_ALL_SSE, "opusenc.sse2.exe", 20150326, "v1.1"},
+       {"256882a5b7af7f23fe9ca6b63d9ec00482e54ee6f621581de385dac7a115046758151c45a97828936f7e967434b9bc19", CPU_TYPE_ALL_ALL, "refalac.exe", 147, ""},
        {"d041b60de6c5c6e77cbad84440db57bbeb021af59dd0f7bebd3ede047d9e2ddc2a0c14179472687ba91063743d23e337", CPU_TYPE_ALL_ALL, "shorten.exe", 361, ""},
-       {"cf988bfbb53e77a1dcaefbd5c08789abb4d67cc210723f1f8ba7850f17d34ebb7d0c426b67b963e7d2290a2744865244", CPU_TYPE_ALL_ALL, "sox.exe", 1441, ""},
+       {"6e3f86cc464d84b0039139c9688e3097d0f42b794a5db10954d24fe77929585a0d0dba16cb677cc1b390392c39cdefad", CPU_TYPE_ALL_ALL, "sox.exe", 1442, ""},
        {"5a4261e1b41a59d1a5bc92e1d2766422a67454d77e06ea29af392811b7b4704e0f3e494ab9cb6375ce9e39257867c5ed", CPU_TYPE_ALL_ALL, "speexdec.exe", 12, ""},
        {"75d4c18dbb74e2dbf7342698428248d45cc4070d5f95da8831ef755e63dcd7ff9c3a760f289e8ef8b5c06b82548edbd8", CPU_TYPE_ALL_ALL, "tag.exe", 100, ""},
        {"a83628880da0b7519ec368a74a92da5a5099d8d46aa0583131f92d7321f47c9e16a1841b2a3fb8ffcca7205ef4b1bb0a", CPU_TYPE_ALL_ALL, "tta.exe", 21, ""},
        {"9e1ade2137ea5cee0ad4657971c314a372df3068594fbe4f77d45b9eb65fa7c69e55027b0df81b6fe072a220e9a8ba8a", CPU_TYPE_ALL_ALL, "valdec.exe", 100, "a"},
        {"509df39fdd7033b0f1af831304d0d6c08b74d5a48e2c038857a78b9dfaa4fb83c6b5c7ea202ba2270c0384607f2316ee", CPU_TYPE_ALL_ALL, "wget.exe", 1140, ""},
        {"572b9448bf4a338ecb9727951fdfcc5a219cc69896695cc96b9f6b083690e339910e41558968264a38992e45f2be152c", CPU_TYPE_ALL_ALL, "wma2wav.exe", 20111001, ""},
-       {"cb4c284352e4c1a923e97d40ecac94fc492bf97dd830ea5ea08fcb7456da6f7152c376c2dfd28cd9bb9b48f96b05e0ec", CPU_TYPE_ALL_ALL, "wupdate.exe", 20140117, ""},
+       {"832b2be006c26f8b5300be0f2485dbfae4373e54f71d302870671a75a34b428b4e3feb387a2420042fb6286826d4fed7", CPU_TYPE_ALL_ALL, "wupdate.exe", 20150514, ""},
        {"221efeabe47e9bf65404c4687df156b326b4fd244d910ef937213e6b0169a57350e897140a2e9965822d60aada609f79", CPU_TYPE_ALL_ALL, "wvunpack.exe", 4700, ""},
        {NULL, NULL, NULL, NULL, NULL}
 };
+
+////////////////////////////////////////////////////////////
+// AAC ENCODERS
+////////////////////////////////////////////////////////////
+
+typedef struct
+{
+       char *const       toolName;
+       const char *const fileNames[8];
+       const quint32     toolMinVersion;
+       const quint32     verDigits;
+       const quint32     verShift;
+       const char *const verStr;
+       const char *const regExpVer;
+       const char *const regExpSig;
+}
+aac_encoder_t;
+
+static const aac_encoder_t g_lamexp_aacenc[] =
+{
+       { "NeroAAC",   { "neroAacEnc.exe", "neroAacDec.exe", "neroAacTag.exe",                                NULL }, 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 }, lamexp_toolver_fhgaacenc(), 1, 100000000, "????-??-??", "fhgaacenc version (\\d+) by tmkk",                                         NULL },
+       { "FdkAacEnc", { "fdkaac.exe",                                                                        NULL }, lamexp_toolver_fdkaacenc(), 3,        10, "v?.?.?",     "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)",                                          NULL },
+       { "QAAC",      { "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll",                                    NULL }, lamexp_toolver_qaacenc(),   2,       100, "v?.??",      "qaac (\\d)\\.(\\d+)",                                                      NULL },
+       { "QAACx64",   { "qaac64.exe", "libsoxr64.dll", "libsoxconvolver64.dll",                              NULL }, lamexp_toolver_qaacenc(),   2,       100, "v?.??",      "qaac (\\d)\\.(\\d+)",                                                      NULL },
+       { NULL, { NULL }, 0, 0, 0, NULL, NULL, NULL }
+};