Обновлен VVdeC v2.3.0-24-gad8f4bb. Устранено падение на процессорах б…

…ез SSE4.1. MPCVideoDec: для видео VVC используем "libvvdec" для всех типов CPU.
Aleksoid1978 · Jun 25, 2024 · 51b4493 · 51b4493
1 parent dbc1c57
commit 51b4493
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 23 deletions.
diff --git a/docs/Changelog.Rus.txt b/docs/Changelog.Rus.txt
@@ -12,7 +12,7 @@
 
 Обновлены библиотеки:
 	ffmpeg git-n7.1-dev-1509-g0c0e7ec81e;
-	vvdec git-v2.3.0-20-gc26979f.
+	vvdec git-v2.3.0-24-gad8f4bb.
 
 
 1.7.2 - 2024-06-07

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
@@ -12,7 +12,7 @@ Updated Japanese translation (by tsubasanouta).
 
 Updated libraries:
 	ffmpeg git-n7.1-dev-1509-g0c0e7ec81e;
-	vvdec git-v2.3.0-20-gc26979f.
+	vvdec git-v2.3.0-24-gad8f4bb.
 
 
 1.7.2 - 2024-06-07

diff --git a/src/ExtLib/vvdec.vcxproj b/src/ExtLib/vvdec.vcxproj
@@ -202,7 +202,6 @@
     <ClCompile Include="vvdec\vvdec\source\Lib\Utilities\ThreadPool.cpp" />
     <ClCompile Include="vvdec\vvdec\source\Lib\vvdec\vvdec.cpp" />
     <ClCompile Include="vvdec\vvdec\source\Lib\vvdec\vvdecimpl.cpp" />
-    <ClCompile Include="vvdec\vvdec\source\Lib\vvdec\wasm_bindings.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="vvdec\vvdec\source\VisualStudio\common.natvis" />
@@ -283,7 +282,6 @@
     <ClInclude Include="vvdec\vvdec\source\Lib\vvdec\resource.h" />
     <ClInclude Include="vvdec\vvdec\source\Lib\vvdec\resource_version.h" />
     <ClInclude Include="vvdec\vvdec\source\Lib\vvdec\vvdecimpl.h" />
-    <ClInclude Include="vvdec\vvdec\source\Lib\vvdec\wasm_bindings.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A5B58721-0F63-4410-9598-880EBDA78C53}</ProjectGuid>

diff --git a/src/ExtLib/vvdec.vcxproj.filters b/src/ExtLib/vvdec.vcxproj.filters
@@ -135,12 +135,6 @@
     <ClCompile Include="vvdec\vvdec\source\Lib\CommonLib\MatrixIntraPrediction.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vvdec\vvdec\source\Lib\CommonLib\Picture.cpp">
-      <Filter>Header Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vvdec\vvdec\source\Lib\CommonLib\SampleAdaptiveOffset.cpp">
-      <Filter>Header Files</Filter>
-    </ClCompile>
     <ClCompile Include="vvdec\vvdec\source\Lib\CommonLib\x86\avx2\Trafo_avx2.cpp">
       <Filter>Source Files\simd</Filter>
     </ClCompile>
@@ -219,9 +213,6 @@
     <ClCompile Include="vvdec\vvdec\source\Lib\vvdec\vvdecimpl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vvdec\vvdec\source\Lib\vvdec\wasm_bindings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="vvdec\vvdec\source\Lib\CommonLib\WeightPrediction.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -297,6 +288,12 @@
     <ClCompile Include="vvdec\vvdec\source\Lib\CommonLib\x86\avx\Trafo_avx.cpp">
       <Filter>Source Files\simd</Filter>
     </ClCompile>
+    <ClCompile Include="vvdec\vvdec\source\Lib\CommonLib\Picture.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vvdec\vvdec\source\Lib\CommonLib\SampleAdaptiveOffset.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="vvdec\vvdec\source\Lib\CommonLib\AdaptiveLoopFilter.h">
@@ -518,9 +515,6 @@
     <ClInclude Include="vvdec\vvdec\source\Lib\vvdec\vvdecimpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vvdec\vvdec\source\Lib\vvdec\wasm_bindings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="vvdec\vvdec\source\Lib\CommonLib\WeightPrediction.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/src/ExtLib/vvdec/vvdec b/src/ExtLib/vvdec/vvdec
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDec.cpp
@@ -2108,12 +2108,7 @@ HRESULT CMPCVideoDecFilter::InitDecoder(const CMediaType* pmt)
 	if (m_CodecId == AV_CODEC_ID_AV1 && (m_bUseDXVA || m_bUseD3D11 || m_bUseD3D11cb || m_bUseD3D12cb || m_bUseNVDEC)) {
 		m_pAVCodec = avcodec_find_decoder_by_name("av1");
 	} else if (m_CodecId == AV_CODEC_ID_VVC) {
-		if (CPUInfo::HaveSSE4()) {
-			// VVdeC crashes on older CPUs. need more info...
-			m_pAVCodec = avcodec_find_decoder_by_name("libvvdec");
-		} else {
-			m_pAVCodec = avcodec_find_decoder_by_name("vvc");
-		}
+		m_pAVCodec = avcodec_find_decoder_by_name("libvvdec");
 	} else {
 		m_pAVCodec = avcodec_find_decoder(m_CodecId);
 	}