Skip to content

Commit d3e6f04

Browse files
author
Sascha Lange
committed
Fix DirectShowLib & nuget Package
1 parent b0f9188 commit d3e6f04

File tree

8 files changed

+65
-42
lines changed

8 files changed

+65
-42
lines changed

‎README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@ Answer issues, open PR, or become a maintainer. Open an issue, if you are willin
1616

1717
## Changelog
1818

19+
Version 3.0:
20+
- Added .NET 8 & .NET 9 compatibility, removed .NET Framework compatibility. If you are still using .NET Framework, please use Version 2.3.0 of WPF MediaKit!
21+
22+
Version 2.3:
23+
- Bugfixes
24+
- Upgraded to .NET Framework 4.8
25+
- Test Application with x64 support
26+
27+
Version 2.2:
28+
- Video snapshots by D3DRenderer.CloneSingleFrameImage()
29+
- D3DRenderer optimizations.
30+
- NuGet package.
31+
32+
Version 2.1:
33+
- Bugfixes (Memory Leak)
34+
- fallback mechanism to auto generate graph if manually generated graph doesn't work
35+
- fix video playback if no audio device is available
36+
- LAV Splitter Source is not hardcorded anymore
37+
- EVR is default Video Renderer
38+
1939
Version 2.0:
2040
- EVR Presenter uses DXVA2 hardware acceleration (thanks to Siegfried Krüger!).
2141
- EVR Presenter doesn't require the DirectX March 2009 Runtimes anymore (thanks to Siegfried Krüger!).

‎Source/Assemblies/DirectShowLib-2005.dll‎

-296 KB
Binary file not shown.

‎Source/DirectShow/MediaPlayers/DvdPlayer.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public int TitleCount
312312
out currentVolume,
313313
out side,
314314
out titleCount);
315-
315+
316316
return titleCount;
317317
}
318318
}
@@ -383,7 +383,7 @@ public void Resume()
383383

384384
IDvdCmd cmd;
385385
m_dvdControl.Resume(DvdCmdFlags.None, out cmd);
386-
386+
387387
if (cmd != null)
388388
Marshal.ReleaseComObject(cmd);
389389
}
@@ -397,7 +397,7 @@ public void SelectRelativeButton(DvdRelativeButtonEnum relativeButton)
397397

398398
if (m_dvdControl == null)
399399
return;
400-
400+
401401
m_dvdControl.SelectRelativeButton((DvdRelativeButton)relativeButton);
402402
}
403403

@@ -606,7 +606,7 @@ private void BuildGraph()
606606
{
607607
var mixer = m_renderer as IVMRMixerControl9;
608608

609-
if(mixer != null)
609+
if (mixer != null)
610610
{
611611
VMR9MixerPrefs dwPrefs;
612612
mixer.GetMixingPrefs(out dwPrefs);
@@ -679,7 +679,7 @@ private void BuildGraph()
679679
}
680680

681681
/* This will be the audio stream pin */
682-
if (mediaType.subType == MediaSubType.DolbyAC3 ||
682+
if (mediaType.subType == MediaSubType.Audio.DolbyAc3 ||
683683
mediaType.subType == MediaSubType.Mpeg2Audio)
684684
{
685685
/* Keep the ref and we'll work with it later */
@@ -752,9 +752,9 @@ private void BuildGraph()
752752
DsError.ThrowExceptionForHR(hr);
753753

754754
/* These are the subtypes most likely to be our dvd subpicture */
755-
var preferedSubpictureTypes = new[]{MediaSubType.ARGB4444,
756-
MediaSubType.AI44,
757-
MediaSubType.AYUV,
755+
var preferedSubpictureTypes = new[]{MediaSubType.ARGB4444,
756+
MediaSubType.AI44,
757+
MediaSubType.AYUV,
758758
MediaSubType.ARGB32};
759759
IPin dvdSubPicturePinOut = null;
760760

‎Source/MediaFoundation/EvrPresenter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public static EvrPresenter CreateNew()
220220
try
221221
{
222222
var path = System.IO.Path.GetDirectoryName(new Uri(typeof(EvrPresenter).Assembly.Location).LocalPath);
223-
var dlltoload = System.IO.Path.Combine(path, IntPtr.Size == 8 ? @"EvrPresenter64.dll" : @"EvrPresenter32.dll");
223+
var dlltoload = System.IO.Path.Combine(path, IntPtr.Size == 8 ? @"runtimes\win-x64\native\EvrPresenter64.dll" : @"runtimes\win-x86\native\EvrPresenter32.dll");
224224
presenter = COMUtil.CreateFromDll<IMFVideoPresenter>(dlltoload, EVR_PRESENTER_CLSID);
225225

226226
int count;

‎Source/WPF MediaKit.csproj‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,29 @@
1010
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
1111
<EnableWindowsTargeting>true</EnableWindowsTargeting>
1212

13-
<AssemblyVersion>3.0.0</AssemblyVersion>
14-
<FileVersion>3.0.0</FileVersion>
13+
<AssemblyVersion>3.0.1</AssemblyVersion>
14+
<FileVersion>3.0.1</FileVersion>
1515

1616

1717
</PropertyGroup>
18+
19+
<PropertyGroup>
20+
<PackageId>WPFMediaKit</PackageId>
21+
<PackageVersion>3.0.1</PackageVersion>
22+
<Authors>WPF MediaKit Team</Authors>
23+
<Owners>WPF MediaKit Team</Owners>
24+
<PackageReadmeFile>README.md</PackageReadmeFile>
25+
<PackageLicenseUrl>https://github.com/Sascha-L/WPF-MediaKit/blob/master/License.txt</PackageLicenseUrl>
26+
<PackageProjectUrl>https://github.com/Sascha-L/WPF-MediaKit</PackageProjectUrl>
27+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
28+
<Description>A library to quickly build DirectShow and MediaFoundation media player controls in WPF. The kit comes with a MediaElement replacement, a VideoCaptureElement for web cams and a DVDPlayerElement that plays DVDs and supports interactive menus.</Description>
29+
<PackageReleaseNotes>Added .NET 8 &amp; .NET 9 compatibility, removed .NET Framework compatibility. Fixed DirectShowLib. If you are still using .NET Framework, please use Version 2.3.0 of WPF MediaKit!</PackageReleaseNotes>
30+
<Copyright>Copyright © 2015-2025 by WPF MediaKit Team</Copyright>
31+
<PackageTags>wpf video directshow evr dvd player media MediaFoundation</PackageTags>
32+
</PropertyGroup>
33+
34+
35+
1836
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1937
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2038
<LangVersion>default</LangVersion>
@@ -31,23 +49,31 @@
3149
</ItemGroup>
3250

3351
<ItemGroup>
52+
<PackageReference Include="DirectShowLib.Net" Version="3.0.0" />
3453
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
3554
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
3655
</ItemGroup>
37-
<ItemGroup>
38-
<Reference Include="DirectShowLib-2005">
39-
<HintPath>Assemblies\DirectShowLib-2005.dll</HintPath>
40-
</Reference>
41-
</ItemGroup>
4256
<ItemGroup>
4357
<None Include="..\License.txt">
4458

4559
<Visible>False</Visible>
4660
</None>
47-
<None Include="..\README.md">
61+
<None Include="..\README.md" Pack="true" PackagePath="\">
4862

4963
<Visible>False</Visible>
5064
</None>
5165

5266
</ItemGroup>
67+
<ItemGroup>
68+
69+
70+
<Content Include="..\EVR Presenter\bin\Release\x86\EVRPresenter32.dll" CopyToOutputDirectory="Always" Pack="true" PackagePath="runtimes\win-x86\native" TargetPath="runtimes\win-x86\native\EVRPresenter32.dll">
71+
<Visible>False</Visible>
72+
</Content>
73+
74+
<Content Include="..\EVR Presenter\bin\Release\x64\EVRPresenter64.dll" CopyToOutputDirectory="Always" Pack="true" PackagePath="runtimes\win-x64\native" TargetPath="runtimes\win-x64\native\EVRPresenter64.dll">
75+
<Visible>False</Visible>
76+
</Content>
77+
</ItemGroup>
78+
5379
</Project>

‎Test Application/EVRPresenter32.dll‎

-41.5 KB
Binary file not shown.

‎Test Application/EVRPresenter64.dll‎

-53 KB
Binary file not shown.

‎Test Application/Test Application.csproj‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,10 @@
2828
<ItemGroup>
2929
<ProjectReference Include="..\Source\WPF MediaKit.csproj" />
3030
</ItemGroup>
31-
<ItemGroup>
32-
<Content Include="EVRPresenter32.dll">
33-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
34-
</Content>
35-
<Content Include="EVRPresenter64.dll">
36-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
37-
</Content>
38-
</ItemGroup>
39-
<ItemGroup>
40-
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
41-
<Visible>False</Visible>
42-
<ProductName>Microsoft .NET Framework 4.8 %28x86 und x64%29</ProductName>
43-
<Install>true</Install>
44-
</BootstrapperPackage>
45-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
46-
<Visible>False</Visible>
47-
<ProductName>.NET Framework 3.5 SP1</ProductName>
48-
<Install>false</Install>
49-
</BootstrapperPackage>
50-
</ItemGroup>
31+
5132
<ItemGroup>
5233
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
5334
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
5435
</ItemGroup>
55-
<ItemGroup>
56-
<Reference Include="DirectShowLib-2005">
57-
<HintPath>..\Source\Assemblies\DirectShowLib-2005.dll</HintPath>
58-
</Reference>
59-
</ItemGroup>
36+
6037
</Project>

0 commit comments

Comments
 (0)