Merge pull request #69 from vvvv/net8

Net8 and `VideoSourceToCvImage`
vvvv · Nov 12, 2024 · 4dba722 · 4dba722
2 parents f2757e2 + 275cf5d
commit 4dba722
Show file tree

Hide file tree

Showing 9 changed files with 322 additions and 91 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,15 @@
-
-# .v4p backup files
-*~.xml
-
-# Dynamic plugins .dll
-bin/
-obj/
-.vs/
-packages/
-lib/net461/
-appveyor/nuget.exe
-/lib/net472/
+
+# .v4p backup files
+*~.xml
+
+# Dynamic plugins .dll
+bin/
+obj/
+.vs/
+packages/
+lib/net461/
+appveyor/nuget.exe
+/lib/net472/
+/lib/net8.0-windows/
 
 /.vl/*
diff --git a/VL.OpenCV.vl b/VL.OpenCV.vl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Document xmlns:p="property" xmlns:r="reflection" Id="AwLbD6sm3YSNSEVWaY0WST" LanguageVersion="2024.6.6" Version="0.128">
   <Patch Id="C8nwPmC7mFvNATECRj2wt9">
     <Canvas Id="EatS5Y30OYxLELRQyBVMYE" DefaultCategory="OpenCV" CanvasType="FullCategory">
@@ -21339,6 +21339,91 @@
             <Link Id="PjYxi1cn8q9NITNE00XGb1" Ids="NjAv9hDrpZdMNrMcpY0Rf8,MRjj6A50sXbM4uIgtwLVhj" />
           </Patch>
         </Node>
+        <!--
+
+    ************************ VideoSourceToCvImage ************************
+
+-->
+        <Node Name="VideoSourceToCvImage" Bounds="210,786" Id="R231iKH8a8BMhyh0f9zMYe">
+          <p:NodeReference>
+            <Choice Kind="ContainerDefinition" />
+          </p:NodeReference>
+          <Patch Id="FRwl0fujKbvMb1Q8Yynhai">
+            <Canvas Id="TpZam8ztoP5QUV4lJMOFDM" CanvasType="Group">
+              <ControlPoint Id="I5OO39XG2ASN1H0LeNW8Uq" Bounds="453,226" />
+              <ControlPoint Id="Jap5vf80hZ4MnD1YjpGXjc" Bounds="633,600" />
+              <ControlPoint Id="SYZUMEz7oTxPq7P4b3FX6g" Bounds="627,226" />
+              <Node Bounds="406,396,100,26" Id="EOQI3re7XfJPtzI4NccgG8">
+                <p:NodeReference LastCategoryFullName="VL.OpenCV.VideoSourceToCvImage" LastDependency="VL.OpenCV.dll">
+                  <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
+                  <CategoryReference Kind="AssemblyCategory" Name="VideoSourceToCvImage" NeedsToBeDirectParent="true" />
+                  <Choice Kind="OperationCallFlag" Name="Create" />
+                </p:NodeReference>
+                <Pin Id="QMEzWcHfKVMQYpQSMuSD9t" Name="Output" Kind="StateOutputPin" />
+                <Pin Id="VIZldNIlE4tOCcgpXeseMI" Name="Node Context" Kind="InputPin" />
+              </Node>
+              <Node Bounds="536,509,105,26" Id="K8SEEVfJZ5HNfgxt8ZMG1L">
+                <p:NodeReference LastCategoryFullName="VL.Lib.Video.VideoSourceToImage`1" LastDependency="VL.CoreLib.dll">
+                  <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
+                  <CategoryReference Kind="AssemblyCategory" Name="VideoSourceToImage`1" NeedsToBeDirectParent="true" />
+                  <Choice Kind="OperationCallFlag" Name="Update" />
+                </p:NodeReference>
+                <Pin Id="HhAPRS6t1weN20XcP7MIkz" Name="Input" Kind="StateInputPin" />
+                <Pin Id="IH1ajiTeQmNLupXjpDucpr" Name="Video Source" Kind="InputPin" />
+                <Pin Id="CROBIpG4qS8QAS9DMCVebf" Name="Fallback" Kind="InputPin" />
+                <Pin Id="Ro63x5dRsfwP1ePHsrRgAT" Name="Mipmapped" Kind="InputPin" />
+                <Pin Id="KxHFuRFMSZjPobAvl3ZMxy" Name="Prefer Push" Kind="InputPin" />
+                <Pin Id="FR9mos3txtUNnmfNccYrL0" Name="Prefer Gpu" Kind="InputPin" />
+                <Pin Id="BcXfd0NueNCNP3oyx81LMW" Name="Output" Kind="StateOutputPin" />
+                <Pin Id="SxfvHIyPx4PON5xtcNCkOY" Name="Result" Kind="OutputPin" />
+              </Node>
+              <Node Bounds="406,509,100,26" Id="BAIdMknFUjyO7WVbdkmgeD">
+                <p:NodeReference LastCategoryFullName="VL.Lib.Video.VideoSourceToImage`1" LastDependency="VL.CoreLib.dll">
+                  <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
+                  <CategoryReference Kind="AssemblyCategory" Name="VideoSourceToImage`1" NeedsToBeDirectParent="true" />
+                  <Choice Kind="OperationCallFlag" Name="Dispose" />
+                </p:NodeReference>
+                <Pin Id="U4RWh7NrBUUP0OPQMtlGwx" Name="Input" Kind="StateInputPin" />
+                <Pin Id="RX28eG9uhwCN3O7xgnL8X5" Name="Output" Kind="StateOutputPin" />
+              </Node>
+              <Pad Id="DiTz3eUtC1ZNxy7eb0l3tO" SlotId="Snvh031cfDGMIBX9scTilr" Bounds="408,459" />
+              <ControlPoint Id="S4KOzuFZXJ3ONIjrVb3kwz" Bounds="856,230" />
+            </Canvas>
+            <Patch Id="T27FmaqslHBM5xY9CTUq13" Name="Create" ParticipatingElements="EOQI3re7XfJPtzI4NccgG8" />
+            <Patch Id="KB62Ygx4ExKPjjwRV94SGl" Name="Update">
+              <Pin Id="Cc0OcLwGuEiOBdnZcKCui0" Name="Input" Kind="InputPin" Bounds="396,148">
+                <p:TypeAnnotation LastCategoryFullName="Video" LastDependency="VL.CoreLib.vl">
+                  <Choice Kind="TypeFlag" Name="IVideoSource" />
+                </p:TypeAnnotation>
+              </Pin>
+              <Pin Id="UwLUtPhHwNlNmypORxRBxo" Name="Fallback" Kind="InputPin" Bounds="627,155" />
+              <Pin Id="KPTvhHrcIi6LYNjFAywP2N" Name="Output" Kind="OutputPin" Bounds="480,460" />
+              <Pin Id="HdUo2Z4bdLjOKttRMQFDLr" Name="Prefer Push" Kind="InputPin" Bounds="801,163" />
+            </Patch>
+            <!--
+
+    ************************  ************************
+
+-->
+            <ProcessDefinition Id="DV9ER7tZ7akO983aUuAcCS">
+              <Fragment Id="FJmavZtZg2QMFmXrfczyib" Patch="T27FmaqslHBM5xY9CTUq13" Enabled="true" />
+              <Fragment Id="THg4kiXGPhHPPZR1NQr0eF" Patch="KB62Ygx4ExKPjjwRV94SGl" Enabled="true" />
+            </ProcessDefinition>
+            <Slot Id="Snvh031cfDGMIBX9scTilr" Name="Impl" />
+            <Patch Id="GAc4g0S6M60QUlKjlvlRiS" Name="Dispose" ParticipatingElements="BAIdMknFUjyO7WVbdkmgeD" />
+            <Link Id="Q3YoEE2gixDPby8rka1X9O" Ids="Cc0OcLwGuEiOBdnZcKCui0,I5OO39XG2ASN1H0LeNW8Uq" IsHidden="true" />
+            <Link Id="DKE05HBOZYPLbCTr6efHHQ" Ids="Jap5vf80hZ4MnD1YjpGXjc,KPTvhHrcIi6LYNjFAywP2N" IsHidden="true" />
+            <Link Id="UBNnPiOwHPlQGYzAI6bEDQ" Ids="UwLUtPhHwNlNmypORxRBxo,SYZUMEz7oTxPq7P4b3FX6g" IsHidden="true" />
+            <Link Id="QC9rPs1wKKnMrNG5itgLJT" Ids="QMEzWcHfKVMQYpQSMuSD9t,DiTz3eUtC1ZNxy7eb0l3tO" />
+            <Link Id="CZaZsKgOdhBPp3yJbZe1sN" Ids="DiTz3eUtC1ZNxy7eb0l3tO,HhAPRS6t1weN20XcP7MIkz" />
+            <Link Id="CYxV71nn53zL4ffkE0OHRM" Ids="DiTz3eUtC1ZNxy7eb0l3tO,U4RWh7NrBUUP0OPQMtlGwx" />
+            <Link Id="HPKkWc1z4n8N2NVRp8ahCs" Ids="I5OO39XG2ASN1H0LeNW8Uq,IH1ajiTeQmNLupXjpDucpr" />
+            <Link Id="UWQR33FLhSRQPJy8FEwcWb" Ids="SYZUMEz7oTxPq7P4b3FX6g,CROBIpG4qS8QAS9DMCVebf" />
+            <Link Id="EsiWaj4S0muODM24wKhdJD" Ids="SxfvHIyPx4PON5xtcNCkOY,Jap5vf80hZ4MnD1YjpGXjc" />
+            <Link Id="CQAl9M8eLhLNd689FZEBJf" Ids="S4KOzuFZXJ3ONIjrVb3kwz,KxHFuRFMSZjPobAvl3ZMxy" />
+            <Link Id="KNvOsqhmXiOLwHCwT6k2bR" Ids="HdUo2Z4bdLjOKttRMQFDLr,S4KOzuFZXJ3ONIjrVb3kwz" IsHidden="true" />
+          </Patch>
+        </Node>
       </Canvas>
       <Canvas Id="QpYsmGeGpdtLyGdVbwMSbw" Name="Tracking" Position="185,460">
         <!--
@@ -21779,7 +21864,6 @@
                           <Pin Id="E2X6U3iL7vKPEPd0Trw3ut" Name="Tracker" Kind="OutputPin" />
                         </Node>
                         <Patch Id="LStcrQnZ8D7NtiW2ppMshu" Name="Dispose" />
-                        <Patch Id="VWOB2kRVfHsPK8id7fUOwd" Name="Dispose" />
                       </Patch>
                     </Node>
                     <Node Bounds="236,233,48,19" Id="PF64GTQnSx2N0bVzE2Ga6O">
@@ -26689,7 +26773,6 @@
                         </Patch>
                       </Node>
                       <Patch Id="KG81KiVY6U5PtneJ08TgzN" Name="Dispose" />
-                      <Patch Id="AMWf9ZIGIdsPnJdy5Y6Lbh" Name="Dispose" />
                     </Patch>
                     <Pin Id="E4c7pfMH3QiN14878kLNcx" Name="Node Context" Kind="InputPin" IsHidden="true" />
                     <Pin Id="RHC1B4NRtGdLBZkQvhTWp9" Name="User Exceptions Channel" Kind="InputPin" IsHidden="true" />
@@ -39204,7 +39287,6 @@
                     </p:TypeAnnotation>
                   </Pad>
                   <Patch Id="HDgsQBgGFa1Lzv9WCrH6L9" Name="Dispose" />
-                  <Patch Id="DSOfwe3jeTjPzp8bFLsPCu" Name="Dispose" />
                 </Patch>
                 <Pin Id="IbLJTfqYhSsPvQIWUyMSUb" Name="Node Context" Kind="InputPin" IsHidden="true" />
                 <Pin Id="BuH5habZN4UNruJIkq2Clh" Name="Enabled" Kind="InputPin" DefaultValue="False">
@@ -49097,11 +49179,11 @@
       <Pin Id="Mrou8fkpIQtLSG8SpOrYsW" MergeId="19725" Name="Rejected Areas" Kind="OutputPin" Bounds="503,958" Summary="Contains the Points of those squares whose inner code has not a correct codification. Useful for debugging purposes." />
     </Patch>
   </Patch>
-  <PlatformDependency Id="M1N4SojOni0Osyx2gZ4x10" Location="./lib/net472/VL.OpenCV.dll" />
+  <PlatformDependency Id="M1N4SojOni0Osyx2gZ4x10" Location="./lib/net8.0-windows/VL.OpenCV.dll" />
   <PlatformDependency Id="UrxLbPlbKmVP94Zx5YWsQo" Location="System" />
   <PlatformDependency Id="KKd4psddv1PM1JDnyYS5Lv" Location="System.Drawing" />
   <PlatformDependency Id="Ee0UUmfqOVWPSXM6OSY7rA" Location="System.Windows.Forms" />
-  <NugetDependency Id="RhOWo82WyqnOWc3NKXTVr9" Location="VL.CoreLib" Version="2024.6.6" />
+  <NugetDependency Id="RhOWo82WyqnOWc3NKXTVr9" Location="VL.CoreLib" Version="2024.6.6" IsFriend="true" />
   <NugetDependency Id="TwpzOT0OmmELnR6LDENtVA" Location="VL.CoreLib.Windows" Version="2024.6.6" />
   <NugetDependency Id="F4rimzHBtAGLdwuyU70Lxy" Location="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
   <NugetDependency Id="A13HOrTwDgsLxp65iajkZ3" Location="OpenCvSharp4" Version="4.9.0.20240103" />

diff --git a/src/Dynamic Enums/VideoInput/VideoInputDeviceDefinition.cs b/src/Dynamic Enums/VideoInput/VideoInputDeviceDefinition.cs
@@ -1,8 +1,8 @@
-using SharpDX.MediaFoundation;
-using System;
+using System;
 using System.Collections.Generic;
 using VL.Lib;
 using VL.Lib.Collections;
+using static Windows.Win32.PInvoke;
 
 namespace VL.OpenCV
 {
@@ -12,21 +12,22 @@ namespace VL.OpenCV
     public class VideoInputDeviceDefinition : DynamicEnumDefinitionBase<VideoInputDeviceDefinition>
     {
         //return the current enum entries
-        protected override IReadOnlyDictionary<string, object> GetEntries()
+        protected override unsafe IReadOnlyDictionary<string, object> GetEntries()
         {
             // Get the collection of video devices
-            Activate[] capDevices = VideoInInfo.EnumerateVideoDevices();
+            var capDevices = VideoInInfo.EnumerateVideoDevices();
             Dictionary<string, object> devices = new Dictionary<string, object>(capDevices.Length);
             for (int i = 0; i < capDevices.Length; i++)
             {
                 var j = 1;
-                var friendlyName = capDevices[i].Get(CaptureDeviceAttributeKeys.FriendlyName);
+                var friendlyName = VideoInInfo.GetString(capDevices[i], in MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
                 var finalName = friendlyName;
                 while (devices.ContainsKey(finalName))
                 {
                     finalName = friendlyName + " #" + j++;
                 }
                 devices[finalName] = i;
+                capDevices[i]->Release();
             }
             return devices;
         }

diff --git a/src/NativeMethods.json b/src/NativeMethods.json
@@ -0,0 +1,5 @@
+{
+  "$schema": "https://aka.ms/CsWin32.schema.json",
+  "allowMarshaling": false,
+  "comInterop": { "preserveSigMethods": [ "ICreateDevEnum" ] }
+}
diff --git a/src/NativeMethods.txt b/src/NativeMethods.txt
@@ -0,0 +1,20 @@
+CoCreateInstance
+IMFActivate
+IMFMediaSource
+MFCreateAttributes
+MFEnumDeviceSources
+MFMediaType_Video
+MF_MT_SUBTYPE
+MF_MT_FRAME_RATE
+MF_MT_FRAME_SIZE
+MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME
+MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE
+MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID
+
+ICreateDevEnum
+IPropertyBag
+CLSID_SystemDeviceEnum
+CLSID_VideoInputDeviceCategory
+VariantInit
+VariantClear
+S_OK
diff --git a/src/VL.OpenCV.csproj b/src/VL.OpenCV.csproj
@@ -2,56 +2,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <ProjectGuid>{BF6BC14C-CC1F-4F5F-B491-452662B4D4A1}</ProjectGuid>
-    <RootNamespace>VL.OpenCV</RootNamespace>
-    <AssemblyName>VL.OpenCV</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <OutputPath>..\lib\</OutputPath>
-    <Version>2.5.0</Version>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <Version>3.0.0</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>1701;1702;MSB3270;MSB3026</NoWarn>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="packages\**" />
-    <EmbeddedResource Remove="packages\**" />
-    <None Remove="packages\**" />
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="FeralTic">
       <HintPath>..\lib\dx11\FeralTic.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
     <Reference Include="VVVV.DX11.Core">
       <HintPath>..\lib\dx11\VVVV.DX11.Core.dll</HintPath>
     </Reference>
-    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DirectShowLib" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.46-beta">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="OpenCvSharp4.Extensions" Version="4.9.0.20240103" />
     <PackageReference Include="OpenCvSharp4.Windows" Version="4.9.0.20240103" />
-    <PackageReference Include="SharpDX.MediaFoundation" Version="4.2.0" />
-    <PackageReference Include="VL.Core" Version="2021.4.8" />
+    <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>
 
 </Project>