Updated Emgu TF MAUI demo to use Emgu CV MAUI 4.8 mini runtime.

emgucv · Sep 12, 2023 · d988574 · d988574
1 parent 3605569
commit d988574
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 15 deletions.
diff --git a/Emgu.TF.Example/CVInterop/CVInterop.NetCore.csproj b/Emgu.TF.Example/CVInterop/CVInterop.NetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Emgu.CV" Version="4.7.0.5276" />
-    <PackageReference Include="Emgu.CV.runtime.windows" Version="4.7.0.5276" />
-    <PackageReference Include="Emgu.CV.UI" Version="4.7.0.5276" />
+    <PackageReference Include="Emgu.CV" Version="4.8.0.5324" />
+    <PackageReference Include="Emgu.CV.runtime.windows" Version="4.8.0.5324" />
+    <PackageReference Include="Emgu.CV.UI" Version="4.8.0.5324" />
     <PackageReference Include="Google.Protobuf" Version="3.21.9" />
   </ItemGroup>
 

diff --git a/Emgu.TF.Example/Inception.Console.NetCore/Inception.Console.NetCore.csproj b/Emgu.TF.Example/Inception.Console.NetCore/Inception.Console.NetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	<AssemblyName>Inception.Console.NetCore</AssemblyName>
 	<Platforms>AnyCPU;x64</Platforms>

diff --git a/Emgu.TF.Example/Maui/InceptionModel.cs b/Emgu.TF.Example/Maui/InceptionModel.cs
@@ -20,6 +20,7 @@
 using Size = System.Drawing.Size;
 using Emgu.CV.CvEnum;
 using System.Runtime.InteropServices;
+using Emgu.CV.Models;
 
 namespace Emgu.TF.Maui.Demo
 {
@@ -59,6 +60,11 @@ public bool Initialized
             }
         }
 
+        public RenderType RenderMethod
+        {
+            get { return Emgu.CV.Models.RenderType.Update; }
+        }
+
         public InceptionModel(Model model)
         {
             _model = model;

diff --git a/Emgu.TF.Example/Maui/MainPage.xaml.cs b/Emgu.TF.Example/Maui/MainPage.xaml.cs
@@ -4,7 +4,7 @@ namespace Emgu.TF.Maui.Demo
 {
     public partial class MainPage : ContentPage
     {
-        int count = 0;
+        //int count = 0;
 
         public MainPage()
         {
@@ -91,7 +91,8 @@ public MainPage()
                 buttonList.Add(stylizeButton);
             }
 
-            if (Device.RuntimePlatform != Device.Android)
+            //if (Device.RuntimePlatform != Device.Android)
+            if (Microsoft.Maui.Devices.DeviceInfo.Platform != DevicePlatform.Android)
             {
                 //LoadSavedModel is not available for Android
                 Button resnetButton = new Button();

diff --git a/Emgu.TF.Example/Maui/Maui.Demo.csproj b/Emgu.TF.Example/Maui/Maui.Demo.csproj
@@ -55,7 +55,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Emgu.CV.runtime.maui.mini" Version="4.7.0.5276" />
+		<PackageReference Include="Emgu.CV.runtime.maui.mini" Version="4.8.0.5324" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 	</ItemGroup>
 

diff --git a/Emgu.TF.Example/Maui/MultiboxDetectionModel.cs b/Emgu.TF.Example/Maui/MultiboxDetectionModel.cs
@@ -22,6 +22,7 @@
 using System.Runtime.InteropServices;
 using Emgu.CV.Structure;
 using static Emgu.CV.DISOpticalFlow;
+using Emgu.CV.Models;
 
 namespace Emgu.TF.Maui.Demo
 {
@@ -48,6 +49,10 @@ public MultiboxDetectionModel()
         {
         }
 
+        public RenderType RenderMethod
+        {
+            get { return Emgu.CV.Models.RenderType.Update; }
+        }
 
         public void Clear()
         {
@@ -143,7 +148,7 @@ public string ProcessAndRender(IInputArray imageIn, IInputOutputArray imageOut)
             using (InputArray iaImage = imageIn.GetInputArray())
             {
                 var imgSize = iaImage.GetSize();
-                iaImage.CopyTo(imageOut);
+                //iaImage.CopyTo(imageOut);
 
                 foreach (Emgu.Models.Annotation annotation in annotations)
                 {

diff --git a/Emgu.TF.Example/Maui/ResnetModel.cs b/Emgu.TF.Example/Maui/ResnetModel.cs
@@ -20,6 +20,7 @@
 using Size = System.Drawing.Size;
 using Emgu.CV.CvEnum;
 using System.Runtime.InteropServices;
+using Emgu.CV.Models;
 
 namespace Emgu.TF.Maui.Demo
 {
@@ -46,6 +47,10 @@ public ResnetModel()
         {
         }
 
+        public RenderType RenderMethod
+        {
+            get { return Emgu.CV.Models.RenderType.Update; }
+        }
 
         public void Clear()
         {
@@ -130,15 +135,12 @@ public string ProcessAndRender(IInputArray imageIn, IInputOutputArray imageOut)
                 resizedMat.ConvertTo(tensorMat, DepthType.Cv32F, 1.0f / 255.0f, 0.0);
             }
 
-
             //Here we are trying to time the execution of the graph after it is loaded
             //If we are not interest in the performance, we can skip the following 3 lines
             Stopwatch sw = Stopwatch.StartNew();
             Resnet.RecognitionResult[] result = _resnet.Recognize(_inputTensor)[0];
             sw.Stop();
 
-
-
             String msg = String.Format(
                 "Object is {0} with {1}% probability. Recognized in {2} milliseconds.",
                 result[0].Label, result[0].Probability * 100, sw.ElapsedMilliseconds);

diff --git a/Emgu.TF.Example/Maui/StylizeModel.cs b/Emgu.TF.Example/Maui/StylizeModel.cs
@@ -20,6 +20,7 @@
 using Size = System.Drawing.Size;
 using Emgu.CV.CvEnum;
 using System.Runtime.InteropServices;
+using Emgu.CV.Models;
 
 namespace Emgu.TF.Maui.Demo
 {
@@ -47,7 +48,10 @@ public StylizeModel()
         {
         }
 
-
+        public RenderType RenderMethod
+        {
+            get { return Emgu.CV.Models.RenderType.Overwrite; }
+        }
         public void Clear()
         {
             if (_stylizeGraph != null)

diff --git a/Emgu.TF.Example/XamarinForms/XamarinForms.WPF/XamarinForms.WPF.csproj b/Emgu.TF.Example/XamarinForms/XamarinForms.WPF/XamarinForms.WPF.csproj
@@ -30,8 +30,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
-    <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2578" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
+    <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2612" />
     <PackageReference Include="WpfLightToolkit">
       <Version>1.0.3</Version>
     </PackageReference>