Skip to content

[Video] Drops dependency to SharpDX.MediaFoundation using Microsoft.Windows.CsWin32 #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
azeno wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Video] Drops dependency to SharpDX.MediaFoundation using Microsoft.Windows.CsWin32 #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sources/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0-preview.4" />
<PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.264" />
<PackageVersion Include="PolySharp" Version="1.15.0" />
<PackageVersion Include="ServiceWire" Version="5.6.0" />
<PackageVersion Include="SharpDX" Version="4.2.0" />
Expand All @@ -22,7 +23,6 @@
<PackageVersion Include="SharpDX.Direct3D11" Version="4.2.0" />
<PackageVersion Include="SharpDX.Direct3D12" Version="4.2.0" />
<PackageVersion Include="SharpDX.DirectInput" Version="4.2.0" />
<PackageVersion Include="SharpDX.MediaFoundation" Version="4.2.0" />
<PackageVersion Include="SharpDX.RawInput" Version="4.2.0" />
<PackageVersion Include="SharpDX.XInput" Version="4.2.0" />
<PackageVersion Include="Silk.NET.Direct3D11" Version="2.22.0" />
Expand Down
5 changes: 5 additions & 0 deletions sources/engine/Stride.Video/NativeMethods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"$schema": "https://aka.ms/CsWin32.schema.json",
"allowMarshaling": false,
"comInterop": { "preserveSigMethods": [ "IMFMediaEngine.OnVideoStreamTick" ] }
}
21 changes: 21 additions & 0 deletions sources/engine/Stride.Video/NativeMethods.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MFStartup
MFShutdown
CLSID_MFMediaEngineClassFactory

CoCreateInstance
IMFMediaEngine
IMFMediaEngineEx
IMFMediaEngineClassFactory
IMFMediaEngineNotify
MFCreateAttributes
MFCreateDXGIDeviceManager
MF_MEDIA_ENGINE_CALLBACK
MF_MEDIA_ENGINE_EVENT
MF_MEDIA_ENGINE_ERR
MF_MEDIA_ENGINE_DXGI_MANAGER
MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT
MF_VERSION

IStream
STATFLAG
MFCreateMFByteStreamOnStream
7 changes: 5 additions & 2 deletions sources/engine/Stride.Video/Stride.Video.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project>
<PropertyGroup>
<StrideRuntime>true</StrideRuntime>
<StrideGraphicsApiDependent>true</StrideGraphicsApiDependent>
Expand All @@ -24,7 +24,10 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Stride.Engine\Stride.Engine.csproj" />
<PackageReference Include="SharpDX.MediaFoundation" Condition="'$(TargetFramework)' == '$(StrideFramework)' Or '$(TargetFramework)' == '$(StrideFrameworkUWP)'" />
<PackageReference Include="Microsoft.Windows.CsWin32" Condition="'$(TargetFramework)' == '$(StrideFramework)' Or '$(TargetFramework)' == '$(StrideFrameworkUWP)'" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Silk.NET.Direct3D11" Condition="'$(TargetFramework)' == '$(StrideFramework)' Or '$(TargetFramework)' == '$(StrideFrameworkUWP)'" />
<PackageReference Include="Silk.NET.Direct3D12" Condition="'$(TargetFramework)' == '$(StrideFramework)'" />
</ItemGroup>
Expand Down
Loading
Loading