memory allocation check

Author: Dogancan Ozturk

Examples/CrossPlatformTest/H264SharpNative-win64.dll

@@ -73,15 +73,29 @@ public static void SetOption(ConverterOption option, int value)
         /// </summary>
         /// <param name="size">The size, in bytes, of the memory to allocate.</param>
         /// <returns>A pointer to the allocated memory, or <see cref="IntPtr.Zero"/> if allocation fails.</returns>
-        public static IntPtr AllocAllignedNative(int size) => //Marshal.AllocHGlobal(size);
-            Defines.Native.AllocAllignedNative(size);
+        public static IntPtr AllocAllignedNative(int size)
+        {
+            //Marshal.AllocHGlobal(size);
+            IntPtr ptr = Defines.Native.AllocAllignedNative(size);
+            if (ptr == IntPtr.Zero)
+            {
+                throw new OutOfMemoryException("Memory allocation failed.");
+            }
+            return ptr;
+        } 
 
         /// <summary>
         /// Frees native memory allocated by <see cref="AllocAllignedNative"/>.
         /// </summary>
         /// <param name="p"></param>
-        public static void FreeAllignedNative(IntPtr p) => //Marshal.FreeHGlobal(p); 
-            Defines.Native.FreeAllignedNative(p);
+        public static void FreeAllignedNative(IntPtr p)
+        {
+           // Marshal.FreeHGlobal(p);
+            if (p != IntPtr.Zero)
+            {
+                Defines.Native.FreeAllignedNative(p);
+            }
+        }
 
         /// <summary>
         /// Converts RGB,BGR,RGBA,BGRA to YUVI420P
@@ -133,6 +147,11 @@ public static void Yuv2Rgb(YuvImage yuv,RgbImage image)
             Yuv2Rgb(yuv.ToYUVImagePointer(), image);
         }
 
+        /// <summary>
+        /// Converts YUV420p image to RGB format
+        /// </summary>
+        /// <param name="yuv"></param>
+        /// <param name="image"></param>
         public static void Yuv2Rgb(YUVImagePointer yuv, RgbImage image)
         {
             unsafe

H264Sharp/Converter.cs

@@ -385,7 +385,7 @@ public YuvImage(int width, int height)
             Height = height;
             strideY = width;
             strideUV = width / 2;
-            this.ImageBytes = Converter.AllocAllignedNative((width * height) + (width * height) / 2);//Marshal.AllocHGlobal((width * height)+(width*height)/2);
+            this.ImageBytes = Converter.AllocAllignedNative((width * height) + ((width * height) / 2));
             ownsNativeMemory = true;
         }
 
@@ -404,21 +404,38 @@ public YuvImage(IntPtr data, int width, int height)
             this.ImageBytes = data;
         }
 
+        /// <summary>
+        ///  Creates Reference instance to existing native yuv data
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="width"></param>
+        /// <param name="height"></param>
+        /// <param name="Ystride"></param>
+        /// <param name="UVstride"></param>
+        public YuvImage(IntPtr data, int width, int height, int Ystride, int UVstride)
+        {
+            Width = width;
+            Height = height;
+            strideY = Ystride;
+            strideUV = UVstride;
+            this.ImageBytes = data;
+        }
+
 
         internal YUVImagePointer ToYUVImagePointer()
         {
 
             return new YUVImagePointer(
                 ImageBytes,
-                IntPtr.Add(ImageBytes, Width * Height),
-                IntPtr.Add(ImageBytes, Width * Height + (Width * Height) / 4),
+                IntPtr.Add(ImageBytes, strideY * Height),
+                IntPtr.Add(ImageBytes, strideY * Height + (strideUV * (Height / 2))),
                 Width, Height, strideY, strideUV);
 
         }
 
         public byte[] GetBytes()
         {
-            byte[] dat = new byte[Width * Height + (Width * Height) / 2];
+            byte[] dat = new byte[Width * Height + (strideUV * (Height / 2))];
 
             unsafe
             {

H264Sharp/Data.cs

@@ -285,16 +285,6 @@ inline void Store(uint8_t* dst,__m256i r1, __m256i g1, __m256i b1) {
 }
 
 
-alignas(32) static const uint8_t shuffle_pattern[16] = {
-	0, 3, 6, 9, 12, 15, 2, 5,
-	8, 11, 14, 1, 4, 7, 10, 13
-};
-
-alignas(32) static const uint8_t blend_mask[16] = {
-	255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 0, 0, 0, 0, 0
-};
-
 __attribute__((target("avx2")))
 inline void GetChannels3_16x16(uint8_t* RESTRICT input, __m256i& rl, __m256i& gl, __m256i& bl, __m256i& rh, __m256i& gh, __m256i& bh)
 {
@@ -365,13 +355,13 @@ inline void pack_16x16(__m256i a, __m256i b, __m256i c, __m256i d, __m256i& low,
 __attribute__((target("avx2")))
 inline void GetChannels4_16x16(uint8_t* RESTRICT src, __m256i& rl, __m256i& gl, __m256i& bl, __m256i& rh, __m256i& gh, __m256i& bh)
 {
-	 const auto rmask = _mm256_setr_epi8(
+	 const __m256i rmask = _mm256_setr_epi8(
 		0, -1, -1, -1, 4, -1, -1, -1, 8, -1, -1, -1, 12, -1, -1, -1, 16,
 		-1, -1, -1, 20, -1, -1, -1, 24, -1, -1, -1, 28, -1, -1, -1);
-	 const auto gmask = _mm256_setr_epi8(
+	 const __m256i gmask = _mm256_setr_epi8(
 		1, -1, -1, -1, 5, -1, -1, -1, 9, -1, -1, -1, 13, -1, -1, -1, 17,
 		-1, -1, -1, 21, -1, -1, -1, 25, -1, -1, -1, 29, -1, -1, -1);
-	 const auto bmask = _mm256_setr_epi8(
+	 const __m256i bmask = _mm256_setr_epi8(
 		2, -1, -1, -1, 6, -1, -1, -1, 10, -1, -1, -1, 14, -1, -1, -1, 18,
 		-1, -1, -1, 22, -1, -1, -1, 26, -1, -1, -1, 30, -1, -1, -1);
 	__m256i rgb1 = _mm256_loadu_si256((__m256i*)src);

H264Sharp/runtimes/android arm32/H264SharpNative-android-arm32.so

@@ -1,15 +1,11 @@
-
 cmake_minimum_required (VERSION 3.8)
-
 project ("OpenH264Wrapper2")
 
-
 add_definitions(-DUNICODE -D_UNICODE)
 add_compile_options(-Rpass=loop-vectorize)
 
 add_compile_options(-O3)
 #add_compile_options(-mavx2)
-#add_compile_options(-msse4.2)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
 
 if(ANDROID)
@@ -72,19 +68,18 @@ add_library (CMakeProject1 SHARED
 "YuvNV12toYV12.cpp"
 "Rgb2Yuv.cpp") 
 
-if (CMAKE_VERSION VERSION_GREATER 3.12)  
-  set_property(TARGET CMakeProject1 PROPERTY CXX_STANDARD 17)
-endif() 
-#output name  
-#H264SharpNative-linux64.so 
-#H264SharpNative-linux64.so
-
+set_property(TARGET CMakeProject1 PROPERTY CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(ANDROID)
+
+target_link_libraries(CMakeProject1 PUBLIC m)
+set(CMAKE_CXX_STANDARD_LIBRARIES "-stdlib=libc++")
+target_link_libraries(CMakeProject1 PUBLIC c++_shared)
+
 set_target_properties(CMakeProject1 PROPERTIES PREFIX "")
-set_target_properties(CMakeProject1 PROPERTIES OUTPUT_NAME "H264SharpNative-android-arm64")
+set_target_properties(CMakeProject1 PROPERTIES OUTPUT_NAME "H264SharpNative-android-x64")
 set_target_properties(CMakeProject1 PROPERTIES SUFFIX ".so")
-
 elseif(UNIX)
 set_target_properties(CMakeProject1 PROPERTIES PREFIX "")
 set_target_properties(CMakeProject1 PROPERTIES OUTPUT_NAME "H264SharpNative-linux-x64") 

H264Sharp/runtimes/android-arm64/H264SharpNative-android-arm64.so

@@ -6,11 +6,9 @@
 #include <queue>
 #include <functional>
 #include <iostream>
-#include <memory>
-#include <new>
+
 #include <atomic>
 #include"pch.h"
-#include <variant>
 
 #if defined(__linux__) || defined(__ANDROID__)
 #include <sys/syscall.h>

H264Sharp/runtimes/android-x64/H264SharpNative-android-x64.so

@@ -17,8 +17,16 @@ cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
       -DANDROID_ABI=arm64-v8a \
       -G Ninja .
 
+export ANDROID_NDK="C:/Program Files (x86)/Android/AndroidNDK/android-ndk-r27c"
+export PATH="$ANDROID_NDK/toolchains/llvm/prebuilt/windows-x86_64/bin:$PATH"
+
+cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
+      -DANDROID_ABI=arm64-v8a \
+      -G Ninja .
 
 
+/---------------------------------------------------
+
 
 export ANDROID_NDK="C:/Program Files (x86)/Android/AndroidNDK/android-ndk-r23c"
 export PATH="$ANDROID_NDK/toolchains/llvm/prebuilt/windows-x86_64/bin:$PATH"
@@ -36,14 +44,27 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
       -G Ninja .
 
 
+//NDK 27
 
+export ANDROID_NDK="C:/Program Files (x86)/Android/AndroidNDK/android-ndk-r27c"
+export PATH="$ANDROID_NDK/toolchains/llvm/prebuilt/windows-x86_64/bin:$PATH"
 
+cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
+      -DANDROID_ABI=arm64-v8a \
+      -G Ninja .
 
 
-      export ANDROID_NDK="C:/Program Files (x86)/Android/AndroidNDK/android-ndk-r27c"
+export ANDROID_NDK="C:/Program Files (x86)/Android/AndroidNDK/android-ndk-r27c"
 export PATH="$ANDROID_NDK/toolchains/llvm/prebuilt/windows-x86_64/bin:$PATH"
 
 cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
-      -DANDROID_ABI=arm64-v8a \
+      -DANDROID_ABI=x86_64 \
       -G Ninja .
+
+
+
+
+
+
+
 */