linux compatibility changes

Author: ReferenceType

Examples/AVRecord/H264SharpNative-win64.dll

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

Examples/H264SharpNativePInvoke/H264SharpNative-win64.dll

@@ -2,7 +2,7 @@
 #include "pch.h"
 
 
-extern "C"  __declspec(dllexport) void Yuv420P2RGB(unsigned char* dst_ptr,
+void Yuv420P2RGB(unsigned char* dst_ptr,
     const unsigned char* y_ptr,
     const unsigned char* u_ptr,
     const unsigned char* v_ptr,
@@ -12,14 +12,14 @@ extern "C"  __declspec(dllexport) void Yuv420P2RGB(unsigned char* dst_ptr,
     signed   int   uv_span,
     signed   int   dst_span,
     bool useSSE,
-   int  threadCount);
+    int numThreads);
 
-extern "C"  __declspec(dllexport) void BGRAtoYUV420Planar(const unsigned char* bgra, unsigned char* dst, int width, int height, int stride, int threadCount);
-extern "C"  __declspec(dllexport) void BGRtoYUV420Planar(unsigned char* bgr, unsigned char* dst, int width, int height, int stride, int threadCount);
-extern "C"  __declspec(dllexport) void RGBAtoYUV420Planar(unsigned char* bgr, unsigned char* dst, int width, int height, int stride, int threadCount);
-extern "C"  __declspec(dllexport) void RGBtoYUV420Planar(unsigned char* bgr, unsigned char* dst, int width, int height, int stride, int  threadCount);
-extern "C"  __declspec(dllexport) void Downscale24(unsigned char* rgbSrc, int width, int height, int stride, unsigned char* dst, int multiplier);
-extern "C"  __declspec(dllexport) void Downscale32(unsigned char* rgbSrc, int width, int height, int stride, unsigned char* dst, int multiplier);
+void BGRAtoYUV420Planar(const unsigned char* bgra, unsigned char* dst, int width, int height, int stride, int threadCount);
+void BGRtoYUV420Planar(unsigned char* bgr, unsigned char* dst, int width, int height, int stride, int threadCount);
+void RGBAtoYUV420Planar(unsigned char* bgr, unsigned char* dst, int width, int height, int stride, int threadCount);
+void RGBtoYUV420Planar(unsigned char* bgr, unsigned char* dst, int width, int height, int stride, int  threadCount);
+void Downscale24(unsigned char* rgbSrc, int width, int height, int stride, unsigned char* dst, int multiplier);
+void Downscale32(unsigned char* rgbSrc, int width, int height, int stride, unsigned char* dst, int multiplier);
 
 //void __cdecl BGRAtoYUV420Planar_(unsigned char* bgra, unsigned char* dst, int width, int height, int stride);
 

Examples/H264SharpNativePInvoke/Properties/launchSettings.json

@@ -1,6 +1,7 @@
 #include "pch.h"
 #include <chrono>
 #include "Decoder.h"
+#include <stdexcept>
 
 namespace H264Sharp {
 
@@ -69,9 +70,7 @@ namespace H264Sharp {
 			throw std::runtime_error("Failed to create decoder");
 		}
 
-#ifndef _WIN32
-		// No need to close library handle on Linux
-#endif
+
 	}
 
 	//void Decoder::Create(const wchar_t* dllname)

H264SharpNative/ConverterLocal.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "pch.h"
 #include <string>
-#include <ppl.h>
+
 
 
 namespace H264Sharp 
@@ -53,7 +53,7 @@ namespace H264Sharp
 		{
 			useSSEConverter = isSSE;
 		};
-		int threadCount = ((4) < (std::thread::hardware_concurrency())) ? (4) : (std::thread::hardware_concurrency());
+		int threadCount = 4;
 
 
 	private:
@@ -62,9 +62,9 @@ namespace H264Sharp
 		ISVCDecoder* decoder= nullptr;
 		bool useSSEConverter = true;
 
-		typedef int(__cdecl* WelsCreateDecoderFunc)(ISVCDecoder** ppDecoder);
+		typedef int(*WelsCreateDecoderFunc)(ISVCDecoder** ppDecoder);
 		WelsCreateDecoderFunc CreateDecoderFunc= nullptr;
-		typedef void(__cdecl* WelsDestroyDecoderFunc)(ISVCDecoder* ppDecoder);
+		typedef void(*WelsDestroyDecoderFunc)(ISVCDecoder* ppDecoder);
 		WelsDestroyDecoderFunc DestroyDecoderFunc= nullptr;
 
 		void Create(const wchar_t* dllName);

H264SharpNative/Decoder.cpp

@@ -13,6 +13,12 @@ namespace H264Sharp {
 		const wchar_t* dllName = is64Bit() ? L"openh264-2.3.1-win64.dll" : L"openh264-2.3.1-win32.dll";
 		Create(dllName);
 	}
+	Encoder::Encoder(std::string dllName)
+	{
+		auto s = std::wstring(dllName.begin(), dllName.end());
+		const wchar_t* dllname = s.c_str();
+		Create(dllname);
+	}
 	Encoder::Encoder(const wchar_t* dllname)
 	{
 		/*auto s = std::wstring(dllName.begin(),dllName.end());
@@ -26,6 +32,8 @@ namespace H264Sharp {
 	EncodedFrame* ef5;
 	void Encoder::Create(const wchar_t* dllname)
 	{
+		std::cout << "New Version " << " loading\n";
+
 		std::cout << dllname << " loading\n";
 
 		// Load dynamic library
@@ -72,7 +80,7 @@ namespace H264Sharp {
 
 		// Close library handle
 #ifdef _WIN32
-		DLL_CLOSE_FUNCTION(handle);
+		//DLL_CLOSE_FUNCTION(handle);
 #else
 // No need to close on Linux
 #endif

H264SharpNative/Decoder.h

@@ -2,7 +2,6 @@
 #include "pch.h"
 #include <string>
 
-#include <ppl.h>
 
 namespace H264Sharp {
 
@@ -13,6 +12,8 @@ namespace H264Sharp {
 	{
 		public:
 			Encoder(const wchar_t* dllname);
+			Encoder(std::string dllName);
+
 			Encoder();
 			~Encoder();
 
@@ -31,7 +32,7 @@ namespace H264Sharp {
 			int ForceIntraFrame();
 			void SetMaxBitrate(int target);
 			void SetTargetFps(float target);
-			int threadCount = ((4) < (std::thread::hardware_concurrency())) ? (4) : (std::thread::hardware_concurrency());
+			int threadCount = 4;
 
 
 	private:
@@ -43,9 +44,9 @@ namespace H264Sharp {
 		SSourcePicture* pic = nullptr;
 		SFrameBSInfo* bsi = nullptr;
 
-		typedef int(__cdecl* WelsCreateSVCEncoder)(ISVCEncoder** ppEncoder);
+		typedef int(* WelsCreateSVCEncoder)(ISVCEncoder** ppEncoder);
 		WelsCreateSVCEncoder CreateEncoderFunc;
-		typedef void(__cdecl* WelsDestroySVCEncoder)(ISVCEncoder* ppEncoder);
+		typedef void(* WelsDestroySVCEncoder)(ISVCEncoder* ppEncoder);
 		WelsDestroySVCEncoder DestroyEncoderFunc;
 
 		void Create(const wchar_t* dllName);