resutructure native code, Converter interop

Author: Dogancan Ozturk

Examples/AVRecord/AVRecord.csproj

@@ -24,6 +24,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="H264SharpNative-win64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="openh264-2.4.1-win64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

Examples/AVRecord/H264SharpNative-win64.dll

@@ -9,10 +9,6 @@
     <!--<RuntimeIdentifier>win-x86</RuntimeIdentifier>-->
 
   </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="H264Sharp" Version="1.4.2" />
-  </ItemGroup>
 
   <ItemGroup>
     <None Update="H264SharpNative-linux64.so">

Examples/CrossPlatformTest/CrossPlatformTest.csproj

@@ -35,14 +35,23 @@ static void Main(string[] args)
             Stopwatch sw = Stopwatch.StartNew();
             var data = BitmapToImageData(bmp);
 
+            YuvImage yuvImage = new YuvImage(w, h);
+            Converter.Rgbx2Yuv(data, yuvImage, 4);
+
+            RgbImage rgb = new RgbImage(w, h);
+            Converter.Yuv2Rgb(yuvImage, rgb, 4);
+
+            Bitmap result2 = RgbToBitmap(rgb);
+            result2.Save("converted.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))
@@ -61,12 +70,20 @@ static void Main(string[] args)
                     //encoded.GetBytes();
                     //encoded.CopyTo(buffer,offset);
 
-                    if (decoder.Decode(encoded, noDelay: true, out DecodingState ds, ref rgbb))
+                    if (decoder.Decode(encoded, noDelay: true, out DecodingState ds, out YUVImagePointer yv))
                     {
-                        //Console.WriteLine($"F:{encoded.FrameType} size: {encoded.Length}");
-                        //Bitmap result = RgbToBitmap(rgbb);
-                        //result.Save("Ok1.bmp");
+                        RgbImage rgba = new RgbImage(w, h);
+                        Converter.Yuv2Rgb(yv, rgba, 4);
+                        Bitmap result22 = RgbToBitmap(rgba);
+                        result22.Save("converted2.bmp");
                     }
+                    //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");
+                      
+                    //}
 
                 }
             }

Examples/CrossPlatformTest/H264SharpNative-win64.dll

@@ -6,15 +6,70 @@ namespace H264Sharp
     public class Converter
     {
 
-        NativeBindings native = new NativeBindings();
+        static NativeBindings native = new NativeBindings();
+
+        public static void Rgbx2Yuv(ImageData from, YuvImage yuv, int numchunks)
+        {
+            unsafe
+            {
+                if (from.isManaged)
+                {
+                    fixed (byte* dp = &from.data[from.dataOffset])
+                    {
+
+                        var ugi = new UnsafeGenericImage()
+                        {
+                            ImageBytes = dp,
+                            Width = from.Width,
+                            Height = from.Height,
+                            Stride = from.Stride,
+                            ImgType = from.ImgType,
+                        };
+                        var refe = yuv.GetRef();
+                        native.RGBXtoYUV(ref ugi, ref refe, numchunks);
+                    }
+                }
+                else
+                {
+                    var ugi = new UnsafeGenericImage()
+                    {
+                        ImageBytes = (byte*)from.imageData.ToPointer(),
+                        Width = from.Width,
+                        Height = from.Height,
+                        Stride = from.Stride,
+                        ImgType = from.ImgType,
+                    };
+                    var refe = yuv.GetRef();
+                    native.RGBXtoYUV(ref ugi, ref refe, numchunks);
+                }
+                
+                   
+            }
+           
+        }
+
+        public static void Yuv2Rgb( YuvImage yuv,RgbImage image, int numchunks)
+        {
+            var rgb = new RGBImagePointer(image.Width, image.Height,image.Stride,image.ImageBytes);
+
+            var yuvref = yuv.GetRef();
+            native.YUV2RGB(ref yuvref, ref rgb, numchunks);
+        }
+        public static void Yuv2Rgb(YUVImagePointer yuv, RgbImage image, int numchunks)
+        {
+            var rgb = new RGBImagePointer(image.Width, image.Height, image.Stride, image.ImageBytes);
+
+            native.YUV2RGB(ref yuv, ref rgb, numchunks);
+        }
+
         /// <summary>
         /// Downslales image by given factor efficiently 
         /// i.e multiplier 2 gives w/2,h/2.
         /// </summary>
         /// <param name="from"></param>
         /// <param name="to"></param>
         /// <param name="multiplier"></param>
-        public void Downscale(ImageData from, RgbImage to, int multiplier)
+        public static void Downscale(ImageData from, RgbImage to, int multiplier)
         {
             unsafe
             {
@@ -67,6 +122,8 @@ public void Downscale(ImageData from, RgbImage to, int multiplier)
                 }
             }
         }
+
+
     }
 }
 

Examples/H264SharpNativePInvoke/H264SharpNative-win64.dll

@@ -142,6 +142,14 @@ public readonly ref struct RGBImagePointer
         public readonly int Stride;
         public readonly IntPtr ImageBytes;
 
+        internal RGBImagePointer(int width, int height, int stride, IntPtr imageBytes)
+        {
+            Width = width;
+            Height = height;
+            Stride = stride;
+            ImageBytes = imageBytes;
+        }
+
         public byte[] GetBytes()
         {
             int Length = Stride * Height;
@@ -179,6 +187,8 @@ public void CopyTo(byte[] buffer, int startIndex)
             Marshal.Copy(ImageBytes, buffer, startIndex, Length);
 
         }
+
+        
     };
 
     /// <summary>
@@ -193,11 +203,69 @@ public unsafe readonly ref struct YUVImagePointer
         public readonly int width;
         public readonly int height;
         public readonly int strideY;
-        public readonly int strideU;
-        public readonly int strideV;
+        public readonly int strideUV;
 
+        public YUVImagePointer(byte* y, byte* u, byte* v, int width, int height, int strideY, int strideUV)
+        {
+            Y = y;
+            U = u;
+            V = v;
+            this.width = width;
+            this.height = height;
+            this.strideY = strideY;
+            this.strideUV = strideUV;
+        }
     };
 
+    public class YuvImage
+    {
+        public int Width;
+        public int Height;
+        public readonly int strideY;
+        public readonly int strideUV;
+        internal IntPtr ImageBytes;
+        private bool disposedValue;
+
+        public YuvImage(int width, int height)
+        {
+            Width = width;
+            Height = height;
+            strideY = width;
+            strideUV =  width/2;
+            this.ImageBytes = Marshal.AllocHGlobal(width * height * 3);
+        }
+
+        internal unsafe YUVImagePointer GetRef()
+        {
+            return new YUVImagePointer(
+                (byte*)ImageBytes.ToPointer(),
+                (byte*)IntPtr.Add(ImageBytes, Width * Height),
+                (byte*)IntPtr.Add(ImageBytes, Width * Height + (Width*Height/2)),
+                Width, Height, strideY, strideUV);
+            
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                Marshal.FreeHGlobal(ImageBytes);
+                disposedValue = true;
+            }
+        }
+
+        ~YuvImage()
+        {
+            Dispose(disposing: false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+    }
+
     /// <summary>
     /// Represents storable and reusable rgb image container
     /// </summary>

Examples/H264SharpNativePInvoke/Program.cs

@@ -23,7 +23,7 @@
   <IncludeContentInPack>true</IncludeContentInPack>
   <SignAssembly>True</SignAssembly>
   <DelaySign>False</DelaySign>
-  <AssemblyOriginatorKeyFile>bin\Release\netstandard2.0\MyKey.snk</AssemblyOriginatorKeyFile>
+  <!--<AssemblyOriginatorKeyFile>bin\Release\netstandard2.0\MyKey.snk</AssemblyOriginatorKeyFile>-->
 
 </PropertyGroup>