diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-09-15 19:46:24 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-09-15 19:46:24 +0400 |
| commit | 88174d2d1720fc8341ee21f0967e7aa726a2c3e8 (patch) | |
| tree | 970b020eac57e2f6b7ec9c1bba66bbedc74b5d4c /src/filters/renderer/VideoRenderers | |
| parent | 08fabf0cb807f2cb1d5b2fc9dca3c180827e07c3 (diff) | |
merge changes from trunk r2365-r2561
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2562 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/renderer/VideoRenderers')
9 files changed, 88 insertions, 116 deletions
diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp index bf51b8e9c..aec11b2d2 100644 --- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp @@ -29,6 +29,7 @@ #include "../../../SubPic/DX9SubPic.h"
#include "../../../SubPic/SubPicQueueImpl.h"
#include "IPinHook.h"
+#include "../include/Version.h"
CCritSec g_ffdshowReceive;
bool queue_ffdshow_support = false;
@@ -92,7 +93,9 @@ CDX9AllocatorPresenter::CDX9AllocatorPresenter(HWND hWnd, bool bFullscreen, HRES }
else
{
- _Error += L"No D3DX9 dll found. To enable stats, shaders and complex resizers, please make sure to install the latest DirectX End-User Runtime.\n";
+ _Error += L"The installed DirectX End-User Runtime is outdated. Please download and install the ";
+ _Error += DIRECTX_SDK_DATE;
+ _Error += L" release or newer in order for MPC-HC to function properly.\n";
}
m_pDwmIsCompositionEnabled = NULL;
@@ -2042,11 +2045,10 @@ void CDX9AllocatorPresenter::DrawStats() LONGLONG llMinJitter = m_MinJitter;
LONGLONG llMaxSyncOffset = m_MaxSyncOffset;
LONGLONG llMinSyncOffset = m_MinSyncOffset;
+ RECT rc = {40, 40, 0, 0 };
if (m_pFont && m_pSprite)
{
m_pSprite->Begin(D3DXSPRITE_ALPHABLEND);
- RECT rc = {700, 40, 0, 0 };
- rc.left = 40;
CString strText;
int TextHeight = 25.0*m_TextScale + 0.5;
// strText.Format(L"Frame rate : %7.03f (%7.3f ms = %.03f, %s) (%7.3f ms = %.03f%s) Clock: %7.3f ms %+1.4f %% %+1.9f %+1.9f", m_fAvrFps, double(m_rtTimePerFrame) / 10000.0, 10000000.0 / (double)(m_rtTimePerFrame), m_bInterlaced ? L"I" : L"P", GetFrameTime() * 1000.0, GetFrameRate(), m_DetectedLock ? L" L" : L"", m_ClockDiff/10000.0, m_ModeratedTimeSpeed*100.0 - 100.0, m_ModeratedTimeSpeedDiff, m_ClockDiffCalc/10000.0);
@@ -2288,6 +2290,7 @@ void CDX9AllocatorPresenter::DrawStats() }
}
m_pSprite->End();
+ OffsetRect(&rc, 0, TextHeight); // Extra "line feed"
}
if (m_pLine && bDetailedStats)
@@ -2300,7 +2303,7 @@ void CDX9AllocatorPresenter::DrawStats() int ScaleX = 1;
int ScaleY = 1;
int DrawWidth = 625 * ScaleX + 50;
- int DrawHeight = 500 * ScaleY;
+ int DrawHeight = 250 * ScaleY;
int Alpha = 80;
StartX = m_WindowRect.Width() - (DrawWidth + 20);
StartY = m_WindowRect.Height() - (DrawHeight + 20);
@@ -2314,13 +2317,13 @@ void CDX9AllocatorPresenter::DrawStats() // m_pLine->SetGLLines(1);
m_pLine->Begin();
- for (int i=10; i<500*ScaleY; i+= 20*ScaleY)
+ for (int i=10; i<250*ScaleY; i+= 10*ScaleY)
{
Points[0].x = (FLOAT)StartX;
Points[0].y = (FLOAT)(StartY + i);
- Points[1].x = (FLOAT)(StartX + ((i-10)%80 ? 50 : 625 * ScaleX));
+ Points[1].x = (FLOAT)(StartX + ((i-10)%40 ? 50 : 625 * ScaleX));
Points[1].y = (FLOAT)(StartY + i);
- if (i == 250) Points[1].x += 50;
+ if (i == 130) Points[1].x += 50;
m_pLine->Draw (Points, 2, D3DCOLOR_XRGB(100,100,255));
}
@@ -2334,7 +2337,7 @@ void CDX9AllocatorPresenter::DrawStats() nIndex += NB_JITTER;
double Jitter = m_pllJitter[nIndex] - m_fJitterMean;
Points[i].x = (FLOAT)(StartX + (i*5*ScaleX+5));
- Points[i].y = (FLOAT)(StartY + ((Jitter*ScaleY)/5000.0 + 250.0* ScaleY));
+ Points[i].y = (FLOAT)(StartY + ((Jitter*ScaleY)/5000.0 + 125.0* ScaleY));
}
m_pLine->Draw (Points, NB_JITTER, D3DCOLOR_XRGB(255,100,100));
@@ -2346,7 +2349,7 @@ void CDX9AllocatorPresenter::DrawStats() if (nIndex < 0)
nIndex += NB_JITTER;
Points[i].x = (FLOAT)(StartX + (i*5*ScaleX+5));
- Points[i].y = (FLOAT)(StartY + ((m_pllSyncOffset[nIndex]*ScaleY)/5000 + 250*ScaleY));
+ Points[i].y = (FLOAT)(StartY + ((m_pllSyncOffset[nIndex]*ScaleY)/5000 + 125*ScaleY));
}
m_pLine->Draw (Points, NB_JITTER, D3DCOLOR_XRGB(100,200,100));
}
diff --git a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp index 098718599..d705bbf31 100644 --- a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp +++ b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp @@ -245,17 +245,17 @@ void CDX9RenderingEngine::CleanupRenderingEngine() HRESULT CDX9RenderingEngine::CreateVideoSurfaces(D3DFORMAT format)
{
+ HRESULT hr;
CRenderersSettings& settings = GetRenderersSettings();
- for (int i = 0; i < m_nNbDXSurface; i++)
- {
- m_pVideoTexture[i] = NULL;
- m_pVideoSurface[i] = NULL;
- }
+ // Free previously allocated video surfaces
+ FreeVideoSurfaces();
- m_SurfaceType = format;
+ // Free previously allocated temporary video textures, because the native video size might have been changed!
+ for (int i = 0; i < 2; i++)
+ m_pTemporaryVideoTextures[i] = NULL;
- HRESULT hr;
+ m_SurfaceType = format;
if (settings.iAPSurfaceUsage == VIDRNDT_AP_TEXTURE2D || settings.iAPSurfaceUsage == VIDRNDT_AP_TEXTURE3D)
{
@@ -312,6 +312,9 @@ void CDX9RenderingEngine::FreeVideoSurfaces() HRESULT CDX9RenderingEngine::RenderVideo(IDirect3DSurface9* pRenderTarget, const CRect& srcRect, const CRect& destRect)
{
+ if (destRect.IsRectEmpty())
+ return S_OK;
+
if (m_RenderingPath == RENDERING_PATH_DRAW)
return RenderVideoDrawPath(pRenderTarget, srcRect, destRect);
else
@@ -322,6 +325,10 @@ HRESULT CDX9RenderingEngine::RenderVideoDrawPath(IDirect3DSurface9* pRenderTarge {
HRESULT hr;
+ // Return if the video texture is not initialized
+ if (m_pVideoTexture[m_nCurSurface] == 0)
+ return S_OK;
+
CRenderersSettings& settings = GetRenderersSettings();
// Initialize the processing pipeline
@@ -531,21 +538,22 @@ HRESULT CDX9RenderingEngine::RenderVideoDrawPath(IDirect3DSurface9* pRenderTarge HRESULT CDX9RenderingEngine::RenderVideoStretchRectPath(IDirect3DSurface9* pRenderTarget, const CRect& srcRect, const CRect& destRect)
{
- HRESULT hr = S_OK;
+ HRESULT hr;
- if (pRenderTarget)
- {
- CRect rSrcVid(srcRect);
- CRect rDstVid(destRect);
+ // Return if the render target or the video surface is not initialized
+ if (pRenderTarget == 0 || m_pVideoSurface[m_nCurSurface] == 0)
+ return S_OK;
- ClipToSurface(pRenderTarget, rSrcVid, rDstVid); // grrr
- // IMPORTANT: rSrcVid has to be aligned on mod2 for yuy2->rgb conversion with StretchRect!!!
- rSrcVid.left &= ~1;
- rSrcVid.right &= ~1;
- rSrcVid.top &= ~1;
- rSrcVid.bottom &= ~1;
- hr = m_pD3DDev->StretchRect(m_pVideoSurface[m_nCurSurface], rSrcVid, pRenderTarget, rDstVid, m_StretchRectFilter);
- }
+ CRect rSrcVid(srcRect);
+ CRect rDstVid(destRect);
+
+ ClipToSurface(pRenderTarget, rSrcVid, rDstVid); // grrr
+ // IMPORTANT: rSrcVid has to be aligned on mod2 for yuy2->rgb conversion with StretchRect!!!
+ rSrcVid.left &= ~1;
+ rSrcVid.right &= ~1;
+ rSrcVid.top &= ~1;
+ rSrcVid.bottom &= ~1;
+ hr = m_pD3DDev->StretchRect(m_pVideoSurface[m_nCurSurface], rSrcVid, pRenderTarget, rDstVid, m_StretchRectFilter);
return hr;
}
@@ -1001,7 +1009,7 @@ HRESULT CDX9RenderingEngine::InitFinalPass() bool bFullFloatingPointProcessing = settings.m_RenderSettings.iVMR9FullFloatingPointProcessing;
bool bColorManagement = settings.m_RenderSettings.iVMR9ColorManagementEnable;
VideoSystem inputVideoSystem = static_cast<VideoSystem>(settings.m_RenderSettings.iVMR9ColorManagementInput);
- GammaCurve gamma = static_cast<GammaCurve>(settings.m_RenderSettings.iVMR9ColorManagementGamma);
+ AmbientLight ambientLight = static_cast<AmbientLight>(settings.m_RenderSettings.iVMR9ColorManagementAmbientLight);
ColorRenderingIntent renderingIntent = static_cast<ColorRenderingIntent>(settings.m_RenderSettings.iVMR9ColorManagementIntent);
bool bInitRequired = false;
@@ -1016,7 +1024,7 @@ HRESULT CDX9RenderingEngine::InitFinalPass() {
if ((m_InputVideoSystem != inputVideoSystem) ||
(m_RenderingIntent != renderingIntent) ||
- (m_Gamma != gamma))
+ (m_AmbientLight != ambientLight))
{
bInitRequired = true;
}
@@ -1037,7 +1045,7 @@ HRESULT CDX9RenderingEngine::InitFinalPass() m_bFullFloatingPointProcessing = bFullFloatingPointProcessing;
m_bColorManagement = bColorManagement;
m_InputVideoSystem = inputVideoSystem;
- m_Gamma = gamma;
+ m_AmbientLight = ambientLight;
m_RenderingIntent = renderingIntent;
// Check whether the final pass is required
@@ -1283,22 +1291,17 @@ HRESULT CDX9RenderingEngine::CreateIccProfileLut(TCHAR* profilePath, float* lut3 // Get the gamma
double gamma;
- switch (m_Gamma)
+ switch (m_AmbientLight)
{
- case GAMMA_CURVE_2_2:
+ case AMBIENT_LIGHT_BRIGHT:
gamma = 2.2;
break;
- case GAMMA_CURVE_2_3:
- gamma = 2.3;
- break;
-
- // Recommended by many (e.g., EBU, Poynton)
- case GAMMA_CURVE_2_35:
+ case AMBIENT_LIGHT_DIM:
gamma = 2.35;
break;
- case GAMMA_CURVE_2_4:
+ case AMBIENT_LIGHT_DARK:
gamma = 2.4;
break;
diff --git a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.h b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.h index 6496cc8e0..d2afd3cf4 100644 --- a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.h +++ b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.h @@ -114,7 +114,7 @@ private: // Settings
VideoSystem m_InputVideoSystem;
- GammaCurve m_Gamma;
+ AmbientLight m_AmbientLight;
ColorRenderingIntent m_RenderingIntent;
// Custom pixel shaders
diff --git a/src/filters/renderer/VideoRenderers/RenderersSettings.h b/src/filters/renderer/VideoRenderers/RenderersSettings.h index 8ebca6af3..7e1d533ce 100644 --- a/src/filters/renderer/VideoRenderers/RenderersSettings.h +++ b/src/filters/renderer/VideoRenderers/RenderersSettings.h @@ -60,12 +60,11 @@ enum VideoSystem VIDEO_SYSTEM_SDTV_PAL,
};
-enum GammaCurve
+enum AmbientLight
{
- GAMMA_CURVE_2_2,
- GAMMA_CURVE_2_3,
- GAMMA_CURVE_2_35, // recommended
- GAMMA_CURVE_2_4,
+ AMBIENT_LIGHT_BRIGHT,
+ AMBIENT_LIGHT_DIM,
+ AMBIENT_LIGHT_DARK,
};
enum ColorRenderingIntent
@@ -97,7 +96,7 @@ public: bool iVMR9FullFloatingPointProcessing;
bool iVMR9ColorManagementEnable;
int iVMR9ColorManagementInput;
- int iVMR9ColorManagementGamma;
+ int iVMR9ColorManagementAmbientLight;
int iVMR9ColorManagementIntent;
bool iVMRDisableDesktopComposition;
int iVMRFlushGPUBeforeVSync;
@@ -124,7 +123,7 @@ public: iVMR9FullFloatingPointProcessing = 0;
iVMR9ColorManagementEnable = 0;
iVMR9ColorManagementInput = VIDEO_SYSTEM_UNKNOWN;
- iVMR9ColorManagementGamma = GAMMA_CURVE_2_35;
+ iVMR9ColorManagementAmbientLight = AMBIENT_LIGHT_BRIGHT;
iVMR9ColorManagementIntent = COLOR_RENDERING_INTENT_PERCEPTUAL;
iVMRDisableDesktopComposition = 0;
iVMRFlushGPUBeforeVSync = 1;
@@ -147,7 +146,7 @@ public: iVMR9FullFloatingPointProcessing = 1;
iVMR9ColorManagementEnable = 0;
iVMR9ColorManagementInput = VIDEO_SYSTEM_UNKNOWN;
- iVMR9ColorManagementGamma = GAMMA_CURVE_2_35;
+ iVMR9ColorManagementAmbientLight = AMBIENT_LIGHT_BRIGHT;
iVMR9ColorManagementIntent = COLOR_RENDERING_INTENT_PERCEPTUAL;
iVMRDisableDesktopComposition = 1;
iVMRFlushGPUBeforeVSync = 1;
@@ -193,26 +192,26 @@ public: CRendererSettingsEVR m_RenderSettings;
- int iAPSurfaceUsage;
- //bool fVMRSyncFix;
- int iDX9Resizer;
- bool fVMR9MixerMode;
- bool fVMR9MixerYUV;
- int iEvrBuffers;
+ int iAPSurfaceUsage;
+ //bool fVMRSyncFix;
+ int iDX9Resizer;
+ bool fVMR9MixerMode;
+ bool fVMR9MixerYUV;
+ int iEvrBuffers;
- int nSPCSize;
- int nSPCMaxRes;
- bool fSPCPow2Tex;
- bool fSPCAllowAnimationWhenBuffering;
+ int nSPCSize;
+ int nSPCMaxRes;
+ bool fSPCPow2Tex;
+ bool fSPCAllowAnimationWhenBuffering;
- CString D3D9RenderDevice;
+ CString D3D9RenderDevice;
};
class CRenderersData
{
- HINSTANCE m_hD3DX9Dll;
- int m_nDXSdkRelease;
+ HINSTANCE m_hD3DX9Dll;
+ int m_nDXSdkRelease;
public:
CRenderersData();
@@ -224,14 +223,14 @@ public: CString m_strD3DX9Version;
// Hardware feature support
- bool m_bFP16Support;
- bool m_b10bitSupport;
+ bool m_bFP16Support;
+ bool m_b10bitSupport;
- LONGLONG GetPerfCounter();
- HINSTANCE GetD3X9Dll();
- int GetDXSdkRelease()
+ LONGLONG GetPerfCounter();
+ HINSTANCE GetD3X9Dll();
+ int GetDXSdkRelease()
{
- return m_nDXSdkRelease;
+ return m_nDXSdkRelease;
};
};
@@ -239,4 +238,4 @@ extern CRenderersData* GetRenderersData(); extern CRenderersSettings& GetRenderersSettings();
extern bool LoadResource(UINT resid, CStringA& str, LPCTSTR restype);
-extern bool IsVistaOrAbove();
+extern "C" BOOL IsVistaOrAbove();
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp index 9370eb226..c15f61044 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp @@ -44,6 +44,7 @@ #include "IPinHook.h"
#include "PixelShaderCompiler.h"
#include "SyncRenderer.h"
+#include "../include/Version.h"
// only for debugging
//#define DISABLE_USING_D3D9EX
@@ -194,7 +195,9 @@ CBaseAP::CBaseAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString &_Error): }
else
{
- _Error += L"No D3DX9 dll found. To enable stats, shaders and complex resizers, please install the latest DirectX End-User Runtime.\n";
+ _Error += L"The installed DirectX End-User Runtime is outdated. Please download and install the ";
+ _Error += DIRECTX_SDK_DATE;
+ _Error += L" release or newer in order for MPC-HC to function properly.\n";
}
m_pDwmIsCompositionEnabled = NULL;
@@ -2306,8 +2309,8 @@ void CBaseAP::DrawStats() int DrawWidth = 625;
int DrawHeight = 250;
int Alpha = 80;
- int StartX = rc.left;
- int StartY = rc.top;
+ int StartX = m_WindowRect.Width() - (DrawWidth + 20);
+ int StartY = m_WindowRect.Height() - (DrawHeight + 20);
DrawRect(RGB(0, 0, 0), Alpha, CRect(StartX, StartY, StartX + DrawWidth, StartY + DrawHeight));
m_pLine->SetWidth(2.5);
diff --git a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp index 7f7fff05a..484f4c517 100644 --- a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp @@ -708,6 +708,9 @@ STDMETHODIMP_(void) CVMR9AllocatorPresenter::SetTime(REFERENCE_TIME rtNow) STDMETHODIMP CVMR9AllocatorPresenter::InitializeDevice(DWORD_PTR dwUserID, VMR9AllocationInfo* lpAllocInfo, DWORD* lpNumBuffers)
{
+ CAutoLock lock(this);
+ CAutoLock cRenderLock(&m_RenderLock);
+
if(!lpAllocInfo || !lpNumBuffers)
return E_POINTER;
@@ -783,7 +786,6 @@ STDMETHODIMP CVMR9AllocatorPresenter::InitializeDevice(DWORD_PTR dwUserID, VMR9A STDMETHODIMP CVMR9AllocatorPresenter::TerminateDevice(DWORD_PTR dwUserID)
{
- DeleteSurfaces();
return S_OK;
}
diff --git a/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj b/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj index bba308c84..2c9ed6d9d 100644 --- a/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj +++ b/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj @@ -51,7 +51,6 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib;..\..\..\thirdparty\lcms2\include;"$(DXSDK_DIR)Include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;DETOURS_X32"
/>
@@ -70,8 +69,7 @@ <Tool
Name="VCLibrarianTool"
AdditionalOptions="/IGNORE:4221"
- AdditionalDependencies="lcms2.lib"
- AdditionalLibraryDirectories="$(OutDir)"
+ AdditionalLibraryDirectories=""
/>
<Tool
Name="VCALinkTool"
@@ -123,7 +121,6 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib;..\..\..\thirdparty\lcms2\include;"$(DXSDK_DIR)Include""
PreprocessorDefinitions="_WIN64;NDEBUG;_WINDOWS;DETOURS_X64"
EnableEnhancedInstructionSet="0"
@@ -143,8 +140,7 @@ <Tool
Name="VCLibrarianTool"
AdditionalOptions="/IGNORE:4221"
- AdditionalDependencies="lcms2.lib"
- AdditionalLibraryDirectories="$(OutDir)"
+ AdditionalLibraryDirectories=""
/>
<Tool
Name="VCALinkTool"
@@ -195,7 +191,6 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib;..\..\..\thirdparty\lcms2\include;"$(DXSDK_DIR)Include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DETOURS_X32"
ShowIncludes="false"
@@ -213,8 +208,7 @@ />
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="lcms2.lib"
- AdditionalLibraryDirectories="$(OutDir)"
+ AdditionalLibraryDirectories=""
/>
<Tool
Name="VCALinkTool"
@@ -262,7 +256,6 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib;..\..\..\thirdparty\lcms2\include;"$(DXSDK_DIR)Include""
PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS;DETOURS_X64"
DebugInformationFormat="3"
@@ -280,8 +273,7 @@ />
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="lcms2.lib"
- AdditionalLibraryDirectories="$(OutDir)"
+ AdditionalLibraryDirectories=""
/>
<Tool
Name="VCALinkTool"
diff --git a/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj b/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj index aff7cc598..6f823c7be 100644 --- a/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj +++ b/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj @@ -17,14 +17,6 @@ <Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Template|Win32">
- <Configuration>Template</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Template|x64">
- <Configuration>Template</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FB565A7A-50DC-4A0D-852D-5E7F74DAB82C}</ProjectGuid>
@@ -42,9 +34,6 @@ <UseOfMfc>Static</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
@@ -68,9 +57,6 @@ <Import Project="..\..\..\common.props" />
<Import Project="..\..\..\release.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\common.props" />
@@ -99,7 +85,6 @@ <TypeLibraryName>.\Release_unicode/mplayerc.tlb</TypeLibraryName>
</Midl>
<ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib;..\..\..\thirdparty\lcms2\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;DETOURS_X32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
@@ -111,8 +96,6 @@ <Lib>
<AdditionalOptions>/IGNORE:4221 %(AdditionalOptions)</AdditionalOptions>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>lcms2.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PostBuildEvent>
<Command>
@@ -131,7 +114,6 @@ <TypeLibraryName>.\Release_unicode/mplayerc.tlb</TypeLibraryName>
</Midl>
<ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib;..\..\..\thirdparty\lcms2\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;DETOURS_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
@@ -144,8 +126,6 @@ <Lib>
<AdditionalOptions>/IGNORE:4221 %(AdditionalOptions)</AdditionalOptions>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>lcms2.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PostBuildEvent>
<Command>
@@ -164,7 +144,6 @@ <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
</Midl>
<ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib;..\..\..\thirdparty\lcms2\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DETOURS_X32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ShowIncludes>false</ShowIncludes>
@@ -175,8 +154,6 @@ </ResourceCompile>
<Lib>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>lcms2.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -191,7 +168,6 @@ <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
</Midl>
<ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib;..\..\..\thirdparty\lcms2\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_WINDOWS;DETOURS_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -202,8 +178,6 @@ </ResourceCompile>
<Lib>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>lcms2.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/src/filters/renderer/VideoRenderers/stdafx.h b/src/filters/renderer/VideoRenderers/stdafx.h index b8a8c06d3..4d70b7896 100644 --- a/src/filters/renderer/VideoRenderers/stdafx.h +++ b/src/filters/renderer/VideoRenderers/stdafx.h @@ -28,10 +28,6 @@ #include "../../../DSUtil/SharedInclude.h"
-#ifndef WINVER
-#define WINVER 0x0600
-#endif
-
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#define ResStr(id) CString(MAKEINTRESOURCE(id))
|