Muldersoft/MediaInfoXP
Muldersoft/MediaInfoXP
1
0
Fork 0
Code Releases 6 Activity

Updated MediaInfo binaries to v21.03 (2021-03-26).

Browse Source
This commit is contained in:
LoRd_MuldeR 2021-06-05 15:31:41 +02:00
parent 94133b295d
commit 86be55cfb9
8 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaInfoXP.qrc
View File

@ -19,5 +19,6 @@
<file>res/bin/MediaInfo.x86-i686.exe</file> <file>res/bin/MediaInfo.x86-i686.exe</file>
<file>res/bin/MediaInfo.x86-sse2.exe</file> <file>res/bin/MediaInfo.x86-sse2.exe</file>
<file>res/bin/MediaInfo.x64-sse2.exe</file> <file>res/bin/MediaInfo.x64-sse2.exe</file>
<file>res/bin/MediaInfo.x64-avx2.exe</file>
</qresource> </qresource>
</RCC> </RCC>

8
MediaInfoXP.vcxproj.filters
View File

@ -27,13 +27,15 @@
<CustomBuild Include="gui\Dialog.ui"> <CustomBuild Include="gui\Dialog.ui">
<Filter>Dialogs</Filter> <Filter>Dialogs</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="MediaInfoXP.qrc" />
<CustomBuild Include="src\MainWindow.h"> <CustomBuild Include="src\MainWindow.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="src\IPC.h"> <CustomBuild Include="src\IPC.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="MediaInfoXP.qrc">
<Filter>Resources</Filter>
</CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Main.cpp"> <ClCompile Include="src\Main.cpp">
@ -67,6 +69,8 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="MediaInfoXP.rcx" /> <ResourceCompile Include="MediaInfoXP.rcx">
<Filter>Resources</Filter>
</ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

BIN
res/bin/MediaInfo.x64-avx2.exe Normal file
View File

Binary file not shown.

BIN
res/bin/MediaInfo.x64-sse2.exe
View File

Binary file not shown.

BIN
res/bin/MediaInfo.x86-i686.exe
View File

Binary file not shown.

BIN
res/bin/MediaInfo.x86-sse2.exe
View File

Binary file not shown.

13
src/Config.h
View File

@ -27,18 +27,19 @@
//Version //Version
MIXP_DEFINE_CONF(unsigned int, mixp_versionMajor, 2) MIXP_DEFINE_CONF(unsigned int, mixp_versionMajor, 2)
MIXP_DEFINE_CONF(unsigned int, mixp_versionMinor, 38) MIXP_DEFINE_CONF(unsigned int, mixp_versionMinor, 39)
MIXP_DEFINE_CONF(unsigned int, mixp_versionPatch, 0) MIXP_DEFINE_CONF(unsigned int, mixp_versionPatch, 0)
//MediaInfo Version //MediaInfo Version
MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerMajor, 20) MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerMajor, 21)
MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerMinor, 9) MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerMinor, 3)
MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerPatch, 0) MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerPatch, 0)
//MediaInfo Checksum //MediaInfo Checksum
MIXP_DEFINE_CONF(char*, mixp_checksum_gen, "fee397f96150db0028416cd8947b9e42a79eca26feeba235955d9abe9aa369164b34435f44858cf46b27c17688e7cdf7dcfbeb397b3701793e64ca5206d3ab79") MIXP_DEFINE_CONF(char*, mixp_checksum_x86_i686, "2ebbd2b1fa84c8e48b49f8b504dc5c08a14e8757f4d17d5f60112ab4ebfcd061a2fdb609b0fb9059febc1088fe020f8ddf253f1bc18927a83d766eb217e72568")
MIXP_DEFINE_CONF(char*, mixp_checksum_sse, "1249935e049ab6a506199f21c95f14f0f7d28fedc8a5a89787de1e83d1c942003f8b483c348e1e294386cffdeb21eed473ceebf7b3c7d3595fa9e7736d131a8d") MIXP_DEFINE_CONF(char*, mixp_checksum_x86_sse2, "822149b4f9d2879bbd37c69b35c92c5bc4ed5c3dae9153dc30cee8fe3ae10d7116ade8c038885adae880f9b7bae0476aba17b5d60f9d8dcdcbe14e6d11cdd2b9")
MIXP_DEFINE_CONF(char*, mixp_checksum_x64, "bbb8a24a97e3690ba19c65e92f5396fafdebb808937a21a6589a9e8fa47147ebd1de2629451bd3619bd0a387e156a86f02d76386a21b46904722032c97f0bd2f") MIXP_DEFINE_CONF(char*, mixp_checksum_x64_sse2, "841bfe999635fde807b8679b89a9f1f03155112d358e16fa11ebda8d79813bd304745df7201f727554e6eaeb34b337e991c12725520f436d0e772a40c3a5a003")
MIXP_DEFINE_CONF(char*, mixp_checksum_x64_avx2, "8f46d5be7cbd1a7bb9750a07d9891a725468506256dfeb0855fdeb8caead47295c977eff4891b9fc22aaeebcb81f1c216fec582b6b55598d0f67f4fd19b07e83")
//Build date //Build date
MIXP_DEFINE_CONF(char*, mixp_buildDate, __DATE__) MIXP_DEFINE_CONF(char*, mixp_buildDate, __DATE__)

13
src/MainWindow.cpp
View File

@ -63,6 +63,8 @@
#define SET_FONT_BOLD(WIDGET,BOLD) { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); } #define SET_FONT_BOLD(WIDGET,BOLD) { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); }
#define SET_TEXT_COLOR(WIDGET,COLOR) { QPalette _palette = WIDGET->palette(); _palette.setColor(QPalette::WindowText, (COLOR)); _palette.setColor(QPalette::Text, (COLOR)); WIDGET->setPalette(_palette); } #define SET_TEXT_COLOR(WIDGET,COLOR) { QPalette _palette = WIDGET->palette(); _palette.setColor(QPalette::WindowText, (COLOR)); _palette.setColor(QPalette::Text, (COLOR)); WIDGET->setPalette(_palette); }
#define APPLICATION_IS_IDLE (m_status == APP_STATUS_IDLE) #define APPLICATION_IS_IDLE (m_status == APP_STATUS_IDLE)
#define HAVE_SSE2(X) ((X).features & MUtils::CPUFetaures::FLAG_SSE2)
#define HAVE_AVX2(X) ((X).features & MUtils::CPUFetaures::FLAG_AVX2)
//Text //Text
const char *STATUS_BLNK = ">> You can drop any type of media files here <<"; const char *STATUS_BLNK = ">> You can drop any type of media files here <<";
@ -80,12 +82,14 @@ static const struct
const char *const checksum; const char *const checksum;
const bool require_x64; const bool require_x64;
const bool require_sse2; const bool require_sse2;
const bool require_avx2;
} }
MEDIAINFO_BIN[] = MEDIAINFO_BIN[] =
{ {
{ "x64-sse2", g_mixp_checksum_x64, bool(1), bool(1) }, { "x64-avx2", g_mixp_checksum_x64_avx2, bool(1), bool(1), bool(1) },
{ "x86-sse2", g_mixp_checksum_sse, bool(0), bool(1) }, { "x64-sse2", g_mixp_checksum_x64_sse2, bool(1), bool(1), bool(0) },
{ "x86-i686", g_mixp_checksum_gen, bool(0), bool(0) }, { "x86-sse2", g_mixp_checksum_x86_sse2, bool(0), bool(1), bool(0) },
{ "x86-i686", g_mixp_checksum_x86_i686, bool(0), bool(0), bool(0) },
{ NULL, NULL, false, false } { NULL, NULL, false, false }
}; };
@ -761,7 +765,6 @@ void CMainWindow::received(const quint32 &command, const QString &message)
// PRIVATE FUNCTIONS // PRIVATE FUNCTIONS
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#define HAVE_SSE2(X) ((X).features & MUtils::CPUFetaures::FLAG_SSE2)
static const char *const HASH_SEED = "+A`~}vPe9'~#n+c1Wq/MPo;1XwY\\;Pb."; static const char *const HASH_SEED = "+A`~}vPe9'~#n+c1Wq/MPo;1XwY\\;Pb.";
static bool VALIDATE_MEDIAINFO(QFile *const handle, const char *const expected_checksum) static bool VALIDATE_MEDIAINFO(QFile *const handle, const char *const expected_checksum)
@ -797,7 +800,7 @@ QPair<QString, const char*> CMainWindow::getMediaInfoArch(void)
{ {
if (cpu_features.x64 || (!MEDIAINFO_BIN[i].require_x64)) if (cpu_features.x64 || (!MEDIAINFO_BIN[i].require_x64))
{ {
if (HAVE_SSE2(cpu_features) || (!MEDIAINFO_BIN[i].require_sse2)) if ((HAVE_SSE2(cpu_features) || (!MEDIAINFO_BIN[i].require_sse2)) && (HAVE_AVX2(cpu_features) || (!MEDIAINFO_BIN[i].require_avx2)))
{ {
return qMakePair(QString::fromLatin1(MEDIAINFO_BIN[i].arch), MEDIAINFO_BIN[i].checksum); return qMakePair(QString::fromLatin1(MEDIAINFO_BIN[i].arch), MEDIAINFO_BIN[i].checksum);
} }