added avx2 support check

Author: ReferenceType

EncoderTest/EncoderTest.csproj

@@ -35,6 +35,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="H264Sharp64">
+      <HintPath>..\x64\Release\H264Sharp64.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -63,11 +66,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\H264Sharp\H264Sharp.vcxproj">
-      <Project>{372f0cee-61ce-42ae-b820-523972d864ac}</Project>
-      <Name>H264Sharp</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

H264Sharp/Decoder.cpp

@@ -26,8 +26,18 @@ namespace H264Sharp {
 	{
 		// Try to load converter library, if cant find we use the C++/ClI version.
 		const wchar_t* converterDll = is64Bit() ? L"Converter64.dll" : L"Converter32.dll";
+		HMODULE lib = NULL;
+		const DWORD Avx2 = 40;
+		if (!IsProcessorFeaturePresent(Avx2))
+		{
+			std::cout << "Unable to use ConverterDLL because AVX2 instructions are not supported! Falling back to CLI convertors" << std::endl;
+		}
+		else 
+		{
+			lib = LoadLibrary(converterDll);
 
-		HMODULE lib = LoadLibrary(converterDll);
+		}
+		
 		if (lib != NULL)
 		{
 			Bgra2Yuv420 = (Yuv2Rgb)GetProcAddress(lib, "Yuv420P2RGB_");
@@ -36,7 +46,7 @@ namespace H264Sharp {
 		}
 		else {
 			auto ss = is64Bit() ? "Converter64.dll" : "Converter32.dll";
-			std::cout << "Unable to load " << ss << ", make sure to include it on your executable path. Falling back to CLI convertors" << std::endl;
+			std::cout << "Decoder: Unable to load " << ss << ", make sure to include it on your executable path. Falling back to CLI convertors" << std::endl;
 			Bgra2Yuv420 = (Yuv2Rgb)Yuv420P2Rgb;
 		}
 
@@ -186,7 +196,8 @@ namespace H264Sharp {
 			rc = decoder->DecodeFrame2(frame, length, buffer, &bufInfo);
 
 		rcc = (DecodingState)rc;
-		if (rc!=0 ) return yuv;
+		//if (rc!=0 ) return yuv;
+		
 		//if (HasFlag(rc, dsRefLost) ) return yuv;
 		if (bufInfo.iBufferStatus != 1) return yuv;
 

H264Sharp/Encoder.cpp

@@ -26,8 +26,16 @@ namespace H264Sharp {
 	void Encoder::Create(const wchar_t* dllname)
 	{
 		const wchar_t* converterDll = is64Bit() ? L"Converter64.dll" : L"Converter32.dll";
-
-		HMODULE lib = LoadLibrary(converterDll);
+		const DWORD Avx2 = 40;
+		HMODULE lib = NULL;
+		if (!IsProcessorFeaturePresent(Avx2)) 
+		{
+			std::cout << "Unable to use ConverterDLL because AVX2 instructions are not supported! Falling back to CLI convertors" << std::endl;
+		}
+		else 
+		{
+			lib = LoadLibrary(converterDll);
+		}
 		if (lib != NULL)
 		{
 			Bgra2Yuv420 = (Covert2Yuv420)GetProcAddress(lib, "BGRAtoYUV420Planar_");
@@ -48,7 +56,7 @@ namespace H264Sharp {
 		}
 		else {
 			auto ss = is64Bit() ? "Converter64.dll" : "Converter32.dll";
-			std::cout << "Unable to load " << ss << ", make sure to include it on your executable path. Falling back to CLI convertors" << std::endl;
+			std::cout << "Encoder: Unable to load " << ss << ", make sure to include it on your executable path. Falling back to CLI convertors" << std::endl;
 			Bgra2Yuv420 = BGRAtoYUV420Planar;
 			Bgr2Yuv420 = BGRtoYUV420Planar;
 			Rgba2Yuv420 = RGBtoYUV420Planar;
@@ -231,7 +239,9 @@ namespace H264Sharp {
 		pic->pData[2] = pic->pData[1] + (width * height >> 2);
 
 		bsi = new SFrameBSInfo();
-
+		bool t = true;
+		encoder->SetOption(ENCODER_OPTION_ENABLE_SSEI, &t);
+		std::cout << "Encoder Set" << std::endl;
 		return 0;
 	};