Merge branch 'Aleksoid1978:master' into master

Hackjjang · Jun 9, 2024 · 49e454b · 49e454b
2 parents 077dbbb + fb946c6
commit 49e454b
Show file tree

Hide file tree

Showing 347 changed files with 12,910 additions and 4,922 deletions.
diff --git a/distrib/MPC_components b/distrib/MPC_components
diff --git a/distrib/mpc-be_setup.iss b/distrib/mpc-be_setup.iss
@@ -68,7 +68,7 @@
   #define Description  = app_name + " x64 " + app_version
   #define VisualElementsManifest = "VisualElements\mpc-be64.VisualElementsManifest.xml"
 #endif
-#define mpcvr_desc     = "MPC Video Renderer 0.8.1"
+#define mpcvr_desc     = "MPC Video Renderer 0.8.3"
 
 [Setup]
 #ifdef Win32Build

diff --git a/docs/Changelog.Rus.txt b/docs/Changelog.Rus.txt
@@ -1,13 +1,50 @@
 В этом файле отображаются только ключевые изменения между разными версиями Media Player Classic - BE.
 
-1.7.1.x dev
+1.7.2.x dev
 =============================
+Обновлены библиотеки:
+	ffmpeg git-n7.1-dev-1158-g7560db937d.
+
+
+1.7.2 - 2024-06-07
+=============================
+AudioSplitter
+Исправлено чтения картинок из ID3v2.3.
+
+FLVSplitter
+Исправлено определение размера видеокадра для некоторых файлов FLV.
+
 MPCVideoDec
-Декодирование VVC сделано с помощью vvdec (https://github.com/fraunhoferhhi/vvdec).
+Для декодирования VVC теперь используется декодер VVdeC (https://github.com/fraunhoferhhi/vvdec).
+Исправлена работа настройки "Отключить DXVA для SD видео (H.264)" для вертикальных видео.
+Исправлены декодирование некоторых VP9 видео.
+Исправлены декодирование некоторых интерлейсных H.264 видео.
+Добавлена проверка метаданных HDR.
+Добавлена поддержка видео HEVC получаемого от WM ASF Reader.
+
+Плеер
+Скорость воспроизведения теперь можно менять с шагом 1%.
+При сохранении только звука с YouTube добавляем к аудиофайлу обложку с помощью доступного FFmpeg.
+Добавлена настройка времени тайм-аута при получении данных из сети.
+
+Инсталлятор
+MPC Video Renderer 0.8.3 включен в инсталлятор.
+
+Обновлен венгерский перевод (автор mickey).
+Обновлен китайский (Simplified) перевод (автор wushantao).
+Обновлен немецкий перевод (автор Klaus1189).
+Обновлен турецкий перевод (автор cmhrky).
+Обновлен итальянский перевод (автор mapi68).
+Обновлен испанский перевод (автор IPeluchito).
+Обновлен японский перевод (автор tsubasanouta).
+Обновлены голландский и китайский (Traditional) переводы (автор beter).
 
 Обновлены библиотеки:
-	ffmpeg git-n7.1-dev-716-g0d9591841b;
-	vvdec git-v2.3.0.
+	ffmpeg git-n7.1-dev-1050-g2c38ca3d37;
+	Little-CMS git-lcms2.16-59-g2daf5c5;
+	MediaInfo git-v24.05-gd9ba2b6c;
+	rapidjson git-v1.1.0-752-gab1842a2;
+	vvdec git-v2.3.0-5-gffe3010.
 
 
 1.7.1 - 2024-05-07
@@ -41,7 +78,7 @@ MPC Video Renderer 0.8.1 включен в инсталлятор.
 Обновлен испанский перевод (автор IPeluchito).
 Обновлен японский перевод (автор tsubasanouta).
 Обновлен румынский перевод (автор AndreiMiloiu).
-Обновлены голландский и китайский (Traditional) переводы (автор beter)
+Обновлены голландский и китайский (Traditional) переводы (автор beter).
 
 Обновлены библиотеки:
 	dav1d git-1.4.1-45-gfc4763c;

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
@@ -1,13 +1,50 @@
 This file includes only a short list of the changes between Media Player Classic - BE's versions.
 
-1.7.1.x dev
+1.7.2.x dev
 =============================
+Updated libraries:
+	ffmpeg git-n7.1-dev-1158-g7560db937d.
+
+
+1.7.2 - 2024-06-07
+=============================
+AudioSplitter
+Fixed reading pictures from ID3v2.3.
+
+FLVSplitter
+Fixed video frame size detection for some FLV files.
+
 MPCVideoDec
-VVC decoding is done using vvdec (https://github.com/fraunhoferhhi/vvdec).
+VVC decoding now uses the VVdeC decoder (https://github.com/fraunhoferhhi/vvdec).
+The "Disable DXVA for SD (H.264)" setting for vertical videos has been fixed.
+Fixed decoding of some VP9 videos.
+Fixed decoding of some interlaced H.264 videos.
+Added validation of HDR metadata.
+Added support for HEVC video received from WM ASF Reader.
+
+Player
+Playback speed can now be changed in 1% increments.
+When saving only audio from YouTube, add cover art to the audio file using the available FFmpeg.
+Added timeout time setting when receiving data from the network.
+
+Installer
+MPC Video Renderer 0.8.3 is included in the installer.
+
+Updated Hungarian translation (by mickey).
+Updated Chinese (Simplified) translation (by wushantao).
+Updated German translation (by Klaus1189).
+Updated Turkish translation (by cmhrky).
+Updated Italian translation (by mapi68).
+Updated Spanish translation (by IPeluchito).
+Updated Japanese translation (by tsubasanouta).
+Updated Dutch and Chinese (Traditional) translation (by beter).
 
 Updated libraries:
-	ffmpeg git-n7.1-dev-716-g0d9591841b;
-	vvdec git-v2.3.0.
+	ffmpeg git-n7.1-dev-1050-g2c38ca3d37;
+	Little-CMS git-lcms2.16-59-g2daf5c5;
+	MediaInfo git-v24.05-gd9ba2b6c;
+	rapidjson git-v1.1.0-752-gab1842a2;
+	vvdec git-v2.3.0-5-gffe3010.
 
 
 1.7.1 - 2024-05-07

diff --git a/include/Version.h b/include/Version.h
@@ -45,7 +45,7 @@
 
 #define MPC_VERSION_MAJOR       1
 #define MPC_VERSION_MINOR       7
-#define MPC_VERSION_PATCH       1
+#define MPC_VERSION_PATCH       2
 
 #define MPC_VERSION_STATUS      0
 // MPC_VERSION_STATUS: 0 - dev; 1 - stable

diff --git a/include/moreuuids.h b/include/moreuuids.h
@@ -265,7 +265,10 @@ DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_HEVC, FCC('HEVC'));
 // {31435648-0000-0010-8000-00AA00389B71} HVC1
 DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_HVC1, FCC('HVC1'));
 
-//{30314D48-0000-0010-8000-00AA00389B71} HEVC HM10.0
+// {31637668-0000-0010-8000-00AA00389B71} hvc1
+DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_hvc1, FCC('hvc1'));
+
+// {30314D48-0000-0010-8000-00AA00389B71} HEVC HM10.0
 DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_HM10, FCC('HM10'));
 
 

diff --git a/include/stdafx_common_dshow.h b/include/stdafx_common_dshow.h
@@ -1,6 +1,6 @@
 /*
  * (C) 2003-2006 Gabest
- * (C) 2006-2021 see Authors.txt
+ * (C) 2006-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -20,6 +20,7 @@
  */
 
 #include <dshow.h>
+#define USE_STD_STRING
 #include <ExtLib/BaseClasses/streams.h>
 #include <dvdmedia.h>
 #include <initguid.h>
diff --git a/src/DSUtil/DXVAState.cpp b/src/DSUtil/DXVAState.cpp
@@ -1,5 +1,5 @@
 /*
- * (C) 2017-2022 see Authors.txt
+ * (C) 2017-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -18,8 +18,6 @@
  *
  */
 
-#pragma once
-
 #include "stdafx.h"
 #include "DXVAState.h"
 #include "apps/mplayerc/mpc_messages.h"

diff --git a/src/DSUtil/GUIDString.cpp b/src/DSUtil/GUIDString.cpp
@@ -24,20 +24,15 @@
 #include <encdec.h> // MEDIASUBTYPE_CPFilters_Processed, FORMATTYPE_CPFilters_Processed
 #include "GUIDString.h"
 
-#define ENTRYNAME(subtype) #subtype
-static const struct {
-	WORD wFormatTag;
-	const CHAR* szName;
-}
-MPC_g_WaveGuidNames[] = {
+static const WaveStringEntry MPC_g_WaveGuidNames[] = {
 	// mmreg.h
-	{WAVE_FORMAT_ADPCM,               "MS_ADPCM"},  //
+	{WAVE_FORMAT_ADPCM,               "MS_ADPCM"},
 	{WAVE_FORMAT_ALAW,                "ALAW"},
 	{WAVE_FORMAT_MULAW,               "MULAW"},
-	{WAVE_FORMAT_IMA_ADPCM,           "IMA_ADPCM"}, //
+	{WAVE_FORMAT_IMA_ADPCM,           "IMA_ADPCM"},
 	{WAVE_FORMAT_WMAVOICE9,           "WMSP1"},
 	{WAVE_FORMAT_DSPGROUP_TRUESPEECH, "TRUESPEECH"},
-	{WAVE_FORMAT_GSM610,              "GSM610"},    //
+	{WAVE_FORMAT_GSM610,              "GSM610"},
 	{WAVE_FORMAT_SHARP_G726,          "G726_ADPCM"},
 	{WAVE_FORMAT_MPEGLAYER3,          "MP3"},
 	{WAVE_FORMAT_VOXWARE_RT29,        "VOXWARE_RT29"},
@@ -49,10 +44,10 @@ MPC_g_WaveGuidNames[] = {
 	{WAVE_FORMAT_INTEL_MUSIC_CODER,   "INTEL_MUSIC"},
 	{WAVE_FORMAT_INDEO_AUDIO,         "INDEO_AUDIO"},
 	{WAVE_FORMAT_DTS2,                "DTS2"},
-	{WAVE_FORMAT_MPEG_ADTS_AAC,       "MPEG_ADTS_AAC"}, //
-	{WAVE_FORMAT_MPEG_RAW_AAC,        "MPEG_RAW_AAC"},  //
-	{WAVE_FORMAT_MPEG_LOAS,           "MPEG_LOAS"},     //
-	{WAVE_FORMAT_MPEG_HEAAC,          "MPEG_HEAAC"},    //
+	{WAVE_FORMAT_MPEG_ADTS_AAC,       "MPEG_ADTS_AAC"},
+	{WAVE_FORMAT_MPEG_RAW_AAC,        "MPEG_RAW_AAC"},
+	{WAVE_FORMAT_MPEG_LOAS,           "MPEG_LOAS"},
+	{WAVE_FORMAT_MPEG_HEAAC,          "MPEG_HEAAC"},
 	{WAVE_FORMAT_WAVPACK_AUDIO,       "WAVPACK4"},
 	{WAVE_FORMAT_OPUS,                "OPUS_WAVE"},
 	{WAVE_FORMAT_SPEEX_VOICE,         "SPEEX"},
@@ -68,8 +63,8 @@ MPC_g_WaveGuidNames[] = {
 	{WAVE_FORMAT_PS2_ADPCM,           "PS2_ADPCM"},      //0xF522
 };
 
-#define ADDENTRY(subtype) { #subtype, subtype },
-static const GUID_STRING_ENTRY MPC_g_GuidNames[] = {
+#define ADDENTRY(subtype) { subtype, #subtype },
+static const GuidStringEntry MPC_g_GuidNames[] = {
 	ADDENTRY(MEDIASUBTYPE_FLAC_FRAMED)
 	ADDENTRY(MEDIASUBTYPE_TAK)
 	ADDENTRY(MEDIASUBTYPE_WavpackHybrid)
@@ -91,7 +86,6 @@ static const GUID_STRING_ENTRY MPC_g_GuidNames[] = {
 	ADDENTRY(MEDIASUBTYPE_Vorbis2)
 	ADDENTRY(FORMAT_VorbisFormat2)
 	ADDENTRY(MEDIASUBTYPE_Matroska)
-	ADDENTRY(MEDIATYPE_Subtitle)
 	ADDENTRY(MEDIASUBTYPE_UTF8)
 	ADDENTRY(MEDIASUBTYPE_SSA)
 	ADDENTRY(MEDIASUBTYPE_ASS)
@@ -127,46 +121,13 @@ static const GUID_STRING_ENTRY MPC_g_GuidNames[] = {
 
 CStringA GetGUIDName(const GUID& guid)
 {
-	if (guid == GUID_NULL) {
-		// to prevent print TIME_FORMAT_NONE for GUID_NULL
-		return "GUID_NULL";
-	}
-
-	const char* guidStr = GuidNames[guid]; // GUID names from uuids.h
-	if (strcmp(guidStr, "Unknown GUID Name") != 0) {
-		return guidStr;
-	}
-
-	if (memcmp(&guid.Data2, &MEDIASUBTYPE_YUY2.Data2, sizeof(GUID) - sizeof(GUID::Data1)) == 0) {
-		// GUID like {xxxxxxxx-0000-0010-8000-00AA00389B71}
-		CStringA str = "MEDIASUBTYPE_";
-
-		if ((guid.Data1 & 0x0000FFFF) == guid.Data1) {
-			const WORD wFormatTag = (WORD)guid.Data1;
-			for (const auto& waveGuidName : MPC_g_WaveGuidNames) {
-				if (waveGuidName.wFormatTag == wFormatTag) {
-					str.Append(waveGuidName.szName);
-					return str;
-				}
-			}
-			str.AppendFormat("0x%04x", wFormatTag);
-			return str;
-		}
-
-		uint32_t fourcc = guid.Data1;
-		for (unsigned i = 0; i < 4; i++) {
-			const uint32_t c = fourcc & 0xff;
-			str.AppendFormat(c < 32 ? "[%u]" : "%c", c);
-			fourcc >>= 8;
-		}
-		return str;
-	}
-
-	for (const auto& guidName : MPC_g_GuidNames) {
-		if (guidName.guid == guid) {
-			return guidName.szName;
-		}
-	}
+	return GuidNames.GetString(guid).c_str();
+}
 
-	return "Unknown GUID Name";
+void SetExtraGuidStrings()
+{
+	GuidNames.SetExtraGuidStrings(
+		&MPC_g_GuidNames[0], std::size(MPC_g_GuidNames),
+		&MPC_g_WaveGuidNames[0], std::size(MPC_g_WaveGuidNames)
+	);
 }
diff --git a/src/DSUtil/GUIDString.h b/src/DSUtil/GUIDString.h
@@ -1,5 +1,5 @@
 /*
- * (C) 2013-2023 see Authors.txt
+ * (C) 2013-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -21,3 +21,4 @@
 #pragma once
 
 CStringA GetGUIDName(const GUID& guid);
+void SetExtraGuidStrings();
diff --git a/src/DSUtil/HTTPAsync.h b/src/DSUtil/HTTPAsync.h
@@ -1,5 +1,5 @@
 /*
- * (C) 2016-2023 see Authors.txt
+ * (C) 2016-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -27,6 +27,8 @@
 
 namespace http {
 	inline CStringW userAgent = L"Mozilla/5.0";
+	inline DWORD connectTimeout = 10000;
+	inline DWORD readTimeout = 10000;
 }
 
 class CHTTPAsync

diff --git a/src/ExtLib/BaseClasses b/src/ExtLib/BaseClasses
diff --git a/src/ExtLib/BaseClasses.vcxproj b/src/ExtLib/BaseClasses.vcxproj
@@ -43,7 +43,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LIB;USE_STD_STRING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>streams.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -63,6 +63,7 @@
     <ClInclude Include="BaseClasses\dllsetup.h" />
     <ClInclude Include="BaseClasses\dxmperf.h" />
     <ClInclude Include="BaseClasses\fourcc.h" />
+    <ClInclude Include="BaseClasses\guidutil.h" />
     <ClInclude Include="BaseClasses\measure.h" />
     <ClInclude Include="BaseClasses\msgthrd.h" />
     <ClInclude Include="BaseClasses\mtype.h" />
@@ -101,6 +102,7 @@
     <ClCompile Include="BaseClasses\ddmm.cpp" />
     <ClCompile Include="BaseClasses\dllentry.cpp" />
     <ClCompile Include="BaseClasses\dllsetup.cpp" />
+    <ClCompile Include="BaseClasses\guidutil.cpp" />
     <ClCompile Include="BaseClasses\mtype.cpp" />
     <ClCompile Include="BaseClasses\outputq.cpp" />
     <ClCompile Include="BaseClasses\perflog.cpp" />

diff --git a/src/ExtLib/BaseClasses.vcxproj.filters b/src/ExtLib/BaseClasses.vcxproj.filters
@@ -44,6 +44,9 @@
     <ClInclude Include="BaseClasses\fourcc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="BaseClasses\guidutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="BaseClasses\measure.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -154,6 +157,9 @@
     <ClCompile Include="BaseClasses\dllsetup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="BaseClasses\guidutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="BaseClasses\mtype.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+ −		MpcVideoRenderer/MpcVideoRenderer.ax
+ −		MpcVideoRenderer/MpcVideoRenderer64.ax
+1 −1		amfilter.cpp
+104 −0		guidutil.cpp
+50 −0		guidutil.h
+1 −0		streams.h
+4 −36		wxdebug.cpp
+0 −23		wxdebug.h