Skip to content

Commit

Permalink
Remove old dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ravazquez committed Nov 12, 2024
1 parent 4b64fb0 commit 7a3a3dc
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 15 deletions.
Binary file removed lib/dx11/FeralTic.dll
Binary file not shown.
Binary file removed lib/dx11/VVVV.DX11.Core.dll
Binary file not shown.
9 changes: 0 additions & 9 deletions src/VL.OpenCV.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
<NoWarn>1701;1702;MSB3270;MSB3026</NoWarn>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<ItemGroup>
<Reference Include="FeralTic">
<HintPath>..\lib\dx11\FeralTic.dll</HintPath>
</Reference>
<Reference Include="VVVV.DX11.Core">
<HintPath>..\lib\dx11\VVVV.DX11.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
Expand All @@ -26,7 +18,6 @@
</PackageReference>
<PackageReference Include="OpenCvSharp4.Extensions" Version="4.9.0.20240103" />
<PackageReference Include="OpenCvSharp4.Windows" Version="4.9.0.20240103" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<!-- CoreLib is a development dependency, it's always shipped by vvvv itself -->
<PackageReference Include="VL.CoreLib" Version="2024.6.6" PrivateAssets="all" />
</ItemGroup>
Expand Down
19 changes: 13 additions & 6 deletions src/VideoInInfo.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using SharpDX.Multimedia;
using System;
using System;
using System.Collections.Generic;
using System.Linq;

using Windows.Win32;
using Windows.Win32.Foundation;
using Windows.Win32.Media.DirectShow;
using Windows.Win32.Media.MediaFoundation;
Expand Down Expand Up @@ -202,8 +199,18 @@ private static string GetVideoFormat(IMFMediaType* mediaType)
// https://docs.microsoft.com/en-us/windows/desktop/medfound/video-subtype-guids
mediaType->GetGUID(MF_MT_SUBTYPE, out var subTypeId);
var fourccEncoded = BitConverter.ToInt32(subTypeId.ToByteArray(), 0);
var fourcc = new FourCC(fourccEncoded);
return fourcc.ToString();
return FourCCToString(fourccEncoded);
}

private static string FourCCToString(int value)
{
return string.Format("{0}", new string(new[]
{
(char) (value & 0xFF),
(char) (value >> 8 & 0xFF),
(char) (value >> 16 & 0xFF),
(char) (value >> 24 & 0xFF),
}));
}

internal static unsafe string GetString(IMFActivate* activate, in Guid guid)
Expand Down

0 comments on commit 7a3a3dc

Please sign in to comment.