fix for wchar_t* portability

Author: ReferenceType

CrossPlatformTest/CrossPlatformTest.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <PublishAot>False</PublishAot>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\H264Sharp\H264Sharp.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="H264SharpNative-linux64.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="H264SharpNative-win64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="libopenh264-2.4.1-linux64.7.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="openh264-2.4.1-win64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="RawBgr.bin">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

…x64/native/H264SharpNative-linux64.so.so …sPlatformTest/H264SharpNative-linux64.soH264Sharp/runtimes/linux64/native/H264SharpNative-linux64.so.so renamed to CrossPlatformTest/H264SharpNative-linux64.so H264Sharp/runtimes/linux64/native/H264SharpNative-linux64.so.so renamed to CrossPlatformTest/H264SharpNative-linux64.so

@@ -0,0 +1,86 @@
+using H264Sharp;
+using System.Diagnostics;
+using System.Drawing;
+
+namespace CrossPlatformTest
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            //Defines.CiscoDllName64bit = "openh264-2.4.0-win64.dll";
+            //Defines.CiscoDllName32bit = "openh264-2.4.0-win32.dll";
+
+            H264Encoder encoder = new H264Encoder();
+            H264Decoder decoder = new H264Decoder();
+
+            encoder.ConverterNumberOfThreads = 4;
+            decoder.ConverterNumberOfThreads = 4;
+            decoder.EnableSSEYUVConversion = true;
+
+            decoder.Initialize();
+
+
+            var w = 1920;
+            var h = 1080;
+            encoder.Initialize(w, h, 200_000_000, 30, ConfigType.CameraBasic);
+            Console.WriteLine("Initialised Encoder");
+
+            Stopwatch sw = Stopwatch.StartNew();
+            var bytes = File.ReadAllBytes("RawBgr.bin");
+            var data = new ImageData(ImageType.Bgra, 1920, 1080, 1920*4, bytes);
+
+            //Converter converter = new Converter();
+            //RgbImage to = new RgbImage(data.Width / 2, data.Height / 2);
+            //converter.Downscale(data,to,2);
+            //var bb = RgbToBitmap(to);
+            //bb.Save("Dowmscaled.bmp");
+
+            RgbImage rgbb = new RgbImage(w, h);
+            for (int j = 0; j < 1000; j++)
+            {
+
+                if (!encoder.Encode(data, out EncodedData[] ec))
+                {
+                    Console.WriteLine("skipped");
+                    continue;
+                }
+
+                //encoder.ForceIntraFrame();
+                //encoder.SetMaxBitrate(2000000);
+                //encoder.SetTargetFps(16.9f);
+
+                foreach (var encoded in ec)
+                {
+                    bool keyframe = encoded.FrameType == FrameType.I || encoded.FrameType == FrameType.IDR;
+                    //encoded.GetBytes();
+                    //encoded.CopyTo(buffer,offset);
+
+                    if (decoder.Decode(encoded, noDelay: true, out DecodingState ds, ref rgbb))
+                    {
+                        //Console.WriteLine($"F:{encoded.FrameType} size: {encoded.Length}");
+                        // Bitmap result = RgbToBitmap(rgbb);
+                        // result.Save("Ok1.bmp");
+                    }
+
+                }
+
+
+            }
+            sw.Stop();
+            Console.WriteLine(sw.ElapsedMilliseconds);
+
+            encoder.Dispose();
+            decoder.Dispose();
+            Console.ReadLine();
+        }
+
+        
+
+     
+           
+
+
+    }
+
+}

CrossPlatformTest/H264SharpNative-win64.dll

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "CrossPlatformTest": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}

CrossPlatformTest/Program.cs

@@ -5,6 +5,7 @@
 using System.Drawing.Imaging;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography;
 using System.Text;
 
 namespace H264PInvoke
@@ -38,15 +39,14 @@ static void Main(string[] args)
 
             Stopwatch sw = Stopwatch.StartNew();
             var data = BitmapToImageData(bmp);
-
             //Converter converter = new Converter();
             //RgbImage to = new RgbImage(data.Width / 2, data.Height / 2);
             //converter.Downscale(data,to,2);
             //var bb = RgbToBitmap(to);
             //bb.Save("Dowmscaled.bmp");
-
+            
             RgbImage rgbb = new RgbImage(w, h);
-            for (int j = 0; j < 1000; j++)
+            for (int j = 0; j < 1; j++)
             {
 
                 if(!encoder.Encode(data, out EncodedData[] ec))
@@ -68,8 +68,8 @@ static void Main(string[] args)
                     if (decoder.Decode(encoded, noDelay: true, out DecodingState ds, ref rgbb))
                     {
                         //Console.WriteLine($"F:{encoded.FrameType} size: {encoded.Length}");
-                       // Bitmap result = RgbToBitmap(rgbb);
-                       // result.Save("Ok1.bmp");
+                        Bitmap result = RgbToBitmap(rgbb);
+                        result.Save("Ok1.bmp");
                     }
 
                 }
@@ -165,7 +165,18 @@ private static ImageData BitmapToImageData(Bitmap bmp)
             // }
 
 
+            var bytes = new byte[bmpData.Stride * height];
+            unsafe
+            {
+                fixed (byte* ptr = bytes)
+                {
+                    Buffer.MemoryCopy((byte*)bmpScan, ptr, bytes.Length, bytes.Length);
+
+                }
 
+            }
+            File.WriteAllBytes("RawBgr.bin",bytes);
+            img = new ImageData(ImageType.Bgra, width, height, bmpData.Stride, bytes);
 
             bmp.UnlockBits(bmpData);
             return img;

CrossPlatformTest/Properties/launchSettings.json

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace H264Sharp
 {