Merge branch 'master' of /~https://github.com/JackD83/ALVR

alvr-org · Jul 22, 2019 · f5fb8dc · f5fb8dc
2 parents cf825dd + 9b647fe
commit f5fb8dc
Show file tree

Hide file tree

Showing 8 changed files with 405 additions and 49 deletions.
diff --git a/ALVR.sln b/ALVR.sln
@@ -15,6 +15,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrashReport", "CrashReport\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{8B1986D1-E993-4B56-B8D0-32B06E424441}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMF", "AMF\AMF.vcxproj", "{84014DF7-D640-4E48-B5F2-7076D630E2AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NvEnc", "NvEnc\NvEnc.vcxproj", "{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,6 +89,26 @@ Global
 		{8B1986D1-E993-4B56-B8D0-32B06E424441}.Release|x64.ActiveCfg = Release|x64
 		{8B1986D1-E993-4B56-B8D0-32B06E424441}.Release|x64.Build.0 = Release|x64
 		{8B1986D1-E993-4B56-B8D0-32B06E424441}.Release|x86.ActiveCfg = Release|x64
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Debug|x64.ActiveCfg = Debug|x64
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Debug|x64.Build.0 = Debug|x64
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Debug|x86.ActiveCfg = Debug|Win32
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Debug|x86.Build.0 = Debug|Win32
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Release|Any CPU.ActiveCfg = Release|Win32
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Release|x64.ActiveCfg = Release|x64
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Release|x64.Build.0 = Release|x64
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Release|x86.ActiveCfg = Release|Win32
+		{84014DF7-D640-4E48-B5F2-7076D630E2AA}.Release|x86.Build.0 = Release|Win32
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Debug|x64.ActiveCfg = Debug|x64
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Debug|x64.Build.0 = Debug|x64
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Debug|x86.ActiveCfg = Debug|Win32
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Debug|x86.Build.0 = Debug|Win32
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Release|Any CPU.ActiveCfg = Release|Win32
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Release|x64.ActiveCfg = Release|x64
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Release|x64.Build.0 = Release|x64
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Release|x86.ActiveCfg = Release|Win32
+		{60C2C23F-C615-4DD3-98AC-FCDAD9FFF17C}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/AMF/AMF.vcxproj b/AMF/AMF.vcxproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\alvr_server\amf\common\AMFFactory.h" />
+    <ClInclude Include="..\alvr_server\amf\common\AMFSTL.h" />
+    <ClInclude Include="..\alvr_server\amf\common\Thread.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\Component.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\ComponentCaps.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\FFMPEGAudioConverter.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\FFMPEGAudioDecoder.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\FFMPEGAudioEncoder.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\FFMPEGComponents.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\FFMPEGFileDemuxer.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\FFMPEGFileMuxer.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\MediaSource.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\VideoConverter.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\VideoDecoderUVD.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\VideoEncoderHEVC.h" />
+    <ClInclude Include="..\alvr_server\amf\include\components\VideoEncoderVCE.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\AudioBuffer.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Buffer.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Compute.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\ComputeFactory.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Context.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Data.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Debug.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Factory.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Interface.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Plane.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\PropertyStorage.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\PropertyStorageEx.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Result.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Surface.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Trace.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Variant.h" />
+    <ClInclude Include="..\alvr_server\amf\include\core\Version.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\alvr_server\amf\common\AMFFactory.cpp" />
+    <ClCompile Include="..\alvr_server\amf\common\AMFSTL.cpp" />
+    <ClCompile Include="..\alvr_server\amf\common\Thread.cpp" />
+    <ClCompile Include="..\alvr_server\amf\common\Windows\ThreadWindows.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{84014DF7-D640-4E48-B5F2-7076D630E2AA}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>AMF</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;AMF_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;AMF_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;AMF_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;AMF_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>