Neon first draft

Author: ReferenceType

Examples/CrossPlatformTest/CrossPlatformTest.csproj

@@ -6,9 +6,14 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PublishAot>False</PublishAot>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <!--<RuntimeIdentifier>win-x86</RuntimeIdentifier>-->
 
   </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\H264Sharp\H264Sharp.csproj" />
+  </ItemGroup>
 
   <ItemGroup>
     <None Update="H264SharpNative-linux64.so">

Examples/CrossPlatformTest/Program.cs

@@ -14,12 +14,15 @@ internal class Program
          */
         static void Main(string[] args)
         {
+            H264Encoder.EnableDebugPrints = true;
+            H264Decoder.EnableDebugPrints = true;
+            Converter.EnableNEON = false;
+            Converter.NumThreads = 1;
+
             H264Encoder encoder = new H264Encoder();
             H264Decoder decoder = new H264Decoder();
 
-            encoder.ConverterNumberOfThreads = 4;
-            decoder.ConverterNumberOfThreads = 4;
-            decoder.EnableSSEYUVConversion = true;
+           
 
             decoder.Initialize();
 
@@ -32,9 +35,22 @@ static void Main(string[] args)
             var bytes = File.ReadAllBytes("RawBgr.bin");
             var data = new ImageData(ImageType.Bgra, 1920, 1080, 1920*4, bytes);
 
-            
-            
-            
+            //Converter.EnableNEON = false;
+
+            YuvImage yuvImage = new YuvImage(w, h);
+            RgbImage rgb = new RgbImage(w, h);
+            Converter.Rgbx2Yuv(data, yuvImage);
+            Converter.Yuv2Rgb(yuvImage, rgb);
+            byte[] dat = new byte[w * h * 3];
+
+            unsafe
+            {
+                fixed (byte* dataPtr = dat)
+                    Buffer.MemoryCopy((byte*)rgb.ImageBytes.ToPointer(), dataPtr, dat.Length, dat.Length);
+            }
+            File.WriteAllBytes("Output.bin", dat);
+           
+
 
             RgbImage rgbb = new RgbImage(w, h);
             for (int j = 0; j < 1000; j++)

Examples/H264SharpNativePInvoke/H264SharpNative-win64.dll

@@ -45,5 +45,8 @@
     <None Update="openh264-2.4.1-win64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Output.bin">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>

Examples/H264SharpNativePInvoke/H264SharpNativePInvoke.csproj

@@ -3,19 +3,71 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Runtime.InteropServices;
 
 namespace H264PInvoke
 {
 #pragma warning disable CA1416 // Validate platform compatibility
 
     internal class Program
     {
+        static Bitmap RawRgbToBitmap(byte[] rawRgbData, int width, int height)
+        {
+            if (rawRgbData.Length != width * height * 3)
+                throw new ArgumentException("The size of the raw RGB data does not match the specified dimensions.");
+
+            // Create a new Bitmap
+            Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format24bppRgb);
+
+            // Lock the Bitmap's bits for writing
+            BitmapData bitmapData = bitmap.LockBits(
+                new Rectangle(0, 0, width, height),
+                ImageLockMode.WriteOnly,
+                PixelFormat.Format24bppRgb);
+
+            // Copy the raw RGB data into the Bitmap's memory
+            IntPtr ptr = bitmapData.Scan0;
+            int stride = bitmapData.Stride;
+            int offset = stride - width * 3;
+
+            // Handle cases where stride is not equal to width * 3
+            if (offset == 0)
+            {
+                Marshal.Copy(rawRgbData, 0, ptr, rawRgbData.Length);
+            }
+            else
+            {
+                // Copy row by row if stride padding exists
+                for (int y = 0; y < height; y++)
+                {
+                    Marshal.Copy(rawRgbData, y * width * 3, ptr + y * stride, width * 3);
+                }
+            }
+
+            // Unlock the Bitmap's bits
+            bitmap.UnlockBits(bitmapData);
+
+            return bitmap;
+        }
         static unsafe void Main(string[] args)
         {
+
+            var bytes = File.ReadAllBytes("Output.bin");
+
+            Bitmap bp = RawRgbToBitmap(bytes, 1920, 1080);
+            bp.Save("CVR.bmp");
+                
+              
+            
+            return;
+
+
+            H264Encoder.EnableDebugPrints = true;   
+            H264Decoder.EnableDebugPrints = true;   
             Converter.EnableSSE = true;
             Converter.NumThreads = 4;
-            Defines.UseCustomThreadPool = true;
-            //BencmarkConverter();
+            Converter.UseCustomThreadPool = false;
+           // BencmarkConverter();
             //return;
             // You can change version or specify the path for cisco dll.
 

Examples/H264SharpNativePInvoke/Output.bin

@@ -10,6 +10,8 @@ public class Converter
     {
 
         public static int NumThreads { set => Defines.Native.ConverterSetNumThreads(value); }
+        public static bool UseCustomThreadPool { set => Defines.Native.EnableCustomPool(value ? 1 : 0); }
+
         public static bool EnableSSE { set => Defines.Native.EnableSSE(value?1:0); }
         public static bool EnableNEON { set => Defines.Native.EnableNEON(value?1:0); }
         /// <summary>

Examples/H264SharpNativePInvoke/Program.cs

@@ -8,7 +8,6 @@ namespace H264Sharp
     public class Defines
     {
         internal readonly static NativeBindings Native = new NativeBindings();
-        public static bool UseCustomThreadPool { set => Native.EnableCustomPool(value ? 1 : 0); }
 
         static Defines()
         {

Examples/H264SharpNativePInvoke/RawBgr.bin

@@ -47,13 +47,14 @@ add_library (CMakeProject1 SHARED
 "Yuv2Rgb.h"
 "Rgb2Yuv.h"
 "Converter.cpp"
-"Decoder.cpp"
+"Decoder.cpp" 
 "dllmain.cpp"
 "Encoder.cpp"
 "ImageTypes.cpp"
 "pch.cpp"
 "Yuv2Rgb.cpp"
 "Yuv2RgbSSE.cpp"
+"Yuv2RgbNEON.cpp"
 "ThreadPool.cpp"
 "Rgb2Yuv.cpp")
 
@@ -71,5 +72,5 @@ set_target_properties(CMakeProject1 PROPERTIES SUFFIX ".so")
 #set_target_properties(CMakeProject1 PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
 # arm-32
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --target=arm-linux-gnueabihf")
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --target=arm-linux-gnueabihf")
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --target=arm-linux-gnueabihf") 
 #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --target=arm-linux-gnueabihf")