LAV
/
LAVCUVID
1
0
Fork 0
Code

Added x64 project configurations.

This commit is contained in:
Hendrik Leppkes 2011-06-02 10:31:13 +02:00
parent 05e28970bf
commit 0f97428f17
4 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
LAVCUVID.sln
View File

@ -11,22 +11,37 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
ReleaseCUDA31|Win32 = ReleaseCUDA31|Win32
ReleaseCUDA31|x64 = ReleaseCUDA31|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.Debug|Win32.ActiveCfg = Debug|Win32
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.Debug|Win32.Build.0 = Debug|Win32
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.Debug|x64.ActiveCfg = Debug|x64
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.Debug|x64.Build.0 = Debug|x64
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.Release|Win32.ActiveCfg = Release|Win32
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.Release|Win32.Build.0 = Release|Win32
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.Release|x64.ActiveCfg = Release|x64
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.Release|x64.Build.0 = Release|x64
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.ReleaseCUDA31|Win32.ActiveCfg = ReleaseCUDA31|Win32
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.ReleaseCUDA31|Win32.Build.0 = ReleaseCUDA31|Win32
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.ReleaseCUDA31|x64.ActiveCfg = ReleaseCUDA31|x64
{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}.ReleaseCUDA31|x64.Build.0 = ReleaseCUDA31|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.ActiveCfg = Debug|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.Build.0 = Debug|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.ActiveCfg = Debug|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.Build.0 = Debug|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.ActiveCfg = Release|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.Build.0 = Release|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|x64.ActiveCfg = Release|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|x64.Build.0 = Release|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.ReleaseCUDA31|Win32.ActiveCfg = Release|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.ReleaseCUDA31|Win32.Build.0 = Release|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.ReleaseCUDA31|x64.ActiveCfg = Release|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.ReleaseCUDA31|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

16
LAVCUVID.vcxproj
View File

@ -5,14 +5,26 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseCUDA31|Win32">
<Configuration>ReleaseCUDA31</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseCUDA31|x64">
<Configuration>ReleaseCUDA31</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{1B77214C-2121-4FFC-8B0F-C0810BC46EF6}</ProjectGuid>
@ -49,7 +61,7 @@
<TargetExt>.ax</TargetExt>
<OutDir>$(SolutionDir)bin_$(PlatformName)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LAVCUVID_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
@ -60,7 +72,7 @@
<AdditionalDependencies>Comctl32.lib;Winmm.lib;d3d9.lib;cuda.lib;nvcuvid.lib;strmbasd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32' Or '$(Configuration)|$(Platform)'=='ReleaseCUDA31|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='ReleaseCUDA31'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LAVCUVID_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

6
common.props
View File

@ -13,7 +13,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)includes;$(SolutionDir)baseclasses;$(CUDA_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)includes;$(SolutionDir)baseclasses;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
@ -25,7 +25,7 @@
<Optimization>Disabled</Optimization>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)bin_$(PlatformName)d\lib;$(CUDA_LIB_PATH);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)bin_$(PlatformName)d\lib;$(CUDA_PATH)\lib\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='ReleaseCUDA31'">
@ -37,7 +37,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)bin_$(PlatformName)\lib;$(CUDA_LIB_PATH);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)bin_$(PlatformName)\lib;$(CUDA_PATH)\lib\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
</Project>

10
src/Media.cpp
View File

@ -22,7 +22,11 @@
#include "Media.h"
// Enable MMX YV12 conversion
#define YV12_MMX
#ifdef _M_X64
#define YV12_MMX 0
#else
#define YV12_MMX 1
#endif
// This can hopefully be made alot faster at some point.
void NV12ChangeStride(BYTE *pOut, const BYTE *pIn, int h, int srcStride, int dstStride)
@ -34,7 +38,7 @@ void NV12ChangeStride(BYTE *pOut, const BYTE *pIn, int h, int srcStride, int dst
}
}
#ifdef YV12_MMX
#if YV12_MMX
// constant for U/V masking
__declspec(align(8)) static const __int64 bm01010101 = 0x00FF00FF00FF00FFLL;
#endif
@ -60,7 +64,7 @@ void NV12ToYV12(BYTE *pOut, const BYTE *pIn, int w, int h, int srcStride, int ds
BYTE *outU = outV + (dstUVstride * h/2);
// MMX version follows, C at the bottom
#ifdef YV12_MMX
#if YV12_MMX
__asm movq mm4, bm01010101;
for(int line = 0; line < h/2; ++line) {