linux integration-cleaning- binaries updated

Author: ReferenceType

Examples/H264SharpNativePInvoke/H264SharpNativePInvoke.csproj

@@ -41,5 +41,8 @@
     <None Update="ocean1080.jpg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="openh264-2.4.1-win64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>

Examples/H264SharpNativePInvoke/openh264-2.4.1-win64.dll

@@ -9,13 +9,17 @@ namespace H264Sharp
     public class Defines
     {
 #if OS_WINDOWS
-        public static string CiscoDllName64bit = "openh264-2.4.0-win64.dll";
-        public static string CiscoDllName32bit = "openh264-2.4.0-win32.dll";
+        public static string CiscoDllName64bit = "openh264-2.4.1-win64.dll";
+        public static string CiscoDllName32bit = "openh264-2.4.1-win32.dll";
 
         public const string WrapperDllName64bit = "H264SharpNative-win64.dll";
         public const string WrapperDllName32bit = "H264SharpNative-win32.dll";
 #elif OS_LINUX
-  // Linux-specific dll
+        public static string CiscoDllName64bit = "libopenh264-2.4.1-linux64.7.so";
+        public static string CiscoDllName32bit = "libopenh264-2.4.1-linux32.7.so";
+
+        public const string WrapperDllName64bit = "H264SharpNative-linux64.so";
+        public const string WrapperDllName32bit = "H264SharpNative-linux32.so";
 #elif OS_FREEBSD
   // FreeBSD-specific dll
 #elif OS_MAC

H264Sharp/Defines.cs

@@ -12,13 +12,16 @@
     <PackageTags>h264;openh264;transcoder;h264sharp</PackageTags>
     <PackageReleaseNotes>https://github.com/ReferenceType/H264Sharp/releases/</PackageReleaseNotes>
     <PackageId>H264Sharp</PackageId>
-    <Description>H264 encoding library well suited for streaming based on Cisco's OpenH264</Description>
+    <Description>Cisco's OpenH264 wrapper for .Net with SIMD color model conversion support</Description>
+
     <Copyright></Copyright>
-    <PackageLicenseFile>Licence.txt</PackageLicenseFile>
   </PropertyGroup>
 
 <PropertyGroup>
   <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  <PackageLicenseFile>Licence.txt</PackageLicenseFile>
+  <IncludeContentInPack>true</IncludeContentInPack>
+
 </PropertyGroup>  
 
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
@@ -36,8 +39,10 @@
 
   <ItemGroup>
     <Content Include="runtimes\win-x64\native\*" CopyToOutputDirectory="Always" Pack="true" PackagePath="\lib\$(TargetFramework)" />
+    <Content Include="runtimes\linux64\native\*" CopyToOutputDirectory="Always" Pack="true" PackagePath="\lib\$(TargetFramework)" />
 
     <Content Include="runtimes\win-x86\native\*" CopyToOutputDirectory="Always" Pack="true" PackagePath="\lib\$(TargetFramework)" />
+    <Content Include="runtimes\linux86\native\*" CopyToOutputDirectory="Always" Pack="true" PackagePath="\lib\$(TargetFramework)" />
   </ItemGroup>
 
   <ItemGroup>

H264Sharp/H264Sharp.csproj

@@ -72,42 +72,6 @@ namespace H264Sharp {
 
 	}
 
-	//void Decoder::Create(const wchar_t* dllname)
-	//{
-	//	// Load Open h264 dll. We need to load create and destroy methods.
-	//	//pin_ptr<const wchar_t> dllname = PtrToStringChars(dllName);
-	//	HMODULE hDll = LoadLibrary(dllname);
-	//	if (hDll == NULL) {
-	//		throw new std::exception("Failed to load Dll ", GetLastError());
-	//	}
-	//	
-
-	//	CreateDecoderFunc = (WelsCreateDecoderFunc)GetProcAddress(hDll, "WelsCreateDecoder");
-	//	if (CreateDecoderFunc == NULL)
-	//	{
-	//		throw new std::exception("Failed to load Dll ", GetLastError());
-	//	}
-
-	//	DestroyDecoderFunc = (WelsDestroyDecoderFunc)GetProcAddress(hDll, "WelsDestroyDecoder");
-	//	if (DestroyDecoderFunc == NULL) 
-	//		throw new std::exception("Failed to load Dll ", GetLastError());
-
-
-	//	ISVCDecoder* dec = nullptr;
-	//	int rc = CreateDecoderFunc(&dec);
-	//	decoder = dec;
-	//	if (rc != 0) 
-	//		throw new std::exception("Failed to load Dll ", GetLastError());
-
-
-	//	/*rc = Initialize();
-	//	if (rc != 0) 
-	//		throw new std::exception("Unable to initialize ", GetLastError());
-	//	
-	//	std::wcout << dllname << " loaded\n";
-	//	dllname = nullptr;*/
-	//}
-
 	int Decoder::Initialize()
 	{
 		SDecodingParam decParam;