Merge pull request #1189 from b-editor/yuto-trd/issue1181

Replace SharpDX.MediaFoundation with Vortice.MediaFoundation
b-editor · Dec 5, 2024 · 2108b57 · 2108b57
2 parents f76aac2 + 46d212a
commit 2108b57
Show file tree

Hide file tree

Showing 11 changed files with 174 additions and 162 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -71,8 +71,6 @@
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="1.2.0" />
-    <PackageVersion Include="SharpDX.Direct3D9" Version="4.2.0" />
-    <PackageVersion Include="SharpDX.MediaFoundation" Version="4.2.0" />
     <PackageVersion Include="Sharprompt" Version="2.4.5" />
     <PackageVersion Include="SkiaSharp" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.88.9" />
@@ -82,6 +80,8 @@
     <PackageVersion Include="System.Interactive.Async" Version="6.0.1" />
     <PackageVersion Include="System.Management" Version="9.0.0" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
+    <PackageVersion Include="Vortice.Direct3D9" Version="3.6.2" />
+    <PackageVersion Include="Vortice.MediaFoundation" Version="3.6.2" />
     <PackageVersion Include="Vortice.XAudio2" Version="3.6.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Beutl.Extensions.MediaFoundation/AspectRatioUtilities.cs b/src/Beutl.Extensions.MediaFoundation/AspectRatioUtilities.cs
@@ -1,6 +1,6 @@
 // https://github.com/amate/MFVideoReader
 
-using SharpDX.MediaFoundation;
+using Vortice.MediaFoundation;
 
 using Windows.Win32;
 using Windows.Win32.Foundation;

diff --git a/src/Beutl.Extensions.MediaFoundation/Beutl.Extensions.MediaFoundation.csproj b/src/Beutl.Extensions.MediaFoundation/Beutl.Extensions.MediaFoundation.csproj
@@ -14,9 +14,9 @@
     <PackageReference Include="Microsoft.Windows.CsWin32">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="SharpDX.Direct3D9" />
-    <PackageReference Include="SharpDX.MediaFoundation" />
     <PackageReference Include="NAudio.Wasapi" />
+    <PackageReference Include="Vortice.Direct3D9" />
+    <PackageReference Include="Vortice.MediaFoundation" />
   </ItemGroup>
 
   <ItemGroup>