legacy branch: merge r2845-r2855 from trunk

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2856 10f7b99b-c216-0410-bff0-8a66a9350fd8

7 files changed, 13 insertions, 65 deletions

diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
index ddf8916ce..15692b85a 100644
--- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
+++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
@@ -63,9 +63,6 @@
 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreAllDefaultLibraries="false"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

-				SubSystem="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -135,9 +132,6 @@
 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

-				SubSystem="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

 				TargetMachine="17"

 			/>

 			<Tool

@@ -206,10 +200,6 @@
 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

 				GenerateDebugInformation="true"

-				SubSystem="2"

-				LargeAddressAware="2"

-				RandomizedBaseAddress="2"

-				DataExecutionPrevention="2"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -280,10 +270,6 @@
 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

 				GenerateDebugInformation="true"

-				SubSystem="2"

-				LargeAddressAware="2"

-				RandomizedBaseAddress="2"

-				DataExecutionPrevention="2"

 				TargetMachine="17"

 			/>

 			<Tool

diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj
index 0feddda82..4d1166d14 100644
--- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj
+++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj
@@ -94,42 +94,34 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

-    <Import Project="..\..\..\release.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

-    <Import Project="..\..\..\debug.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

-    <Import Project="..\..\..\release.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

-    <Import Project="..\..\..\debug.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />

-    <Import Project="..\..\..\release.props" />

   </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" />

-    <Import Project="..\..\..\debug.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Filter|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" />

-    <Import Project="..\..\..\release.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Filter|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" />

-    <Import Project="..\..\..\debug.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

@@ -154,10 +146,6 @@
       <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Debug_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <ModuleDefinitionFile>MpcAudioRenderer.def</ModuleDefinitionFile>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

@@ -175,10 +163,6 @@
       <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>

       <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Debug_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>MpcAudioRenderer.def</ModuleDefinitionFile>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

@@ -193,10 +177,6 @@
       <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>MpcAudioRenderer.def</ModuleDefinitionFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <LargeAddressAware>true</LargeAddressAware>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <DataExecutionPrevention>true</DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

@@ -215,10 +195,6 @@
       <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>MpcAudioRenderer.def</ModuleDefinitionFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <LargeAddressAware>true</LargeAddressAware>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <DataExecutionPrevention>true</DataExecutionPrevention>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

diff --git a/src/filters/renderer/SyncClock/SyncClock.vcxproj b/src/filters/renderer/SyncClock/SyncClock.vcxproj
index 770f8eabd..3f4904b0e 100644
--- a/src/filters/renderer/SyncClock/SyncClock.vcxproj
+++ b/src/filters/renderer/SyncClock/SyncClock.vcxproj
@@ -54,22 +54,18 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

-    <Import Project="..\..\..\debug.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

-    <Import Project="..\..\..\release.props" />

   </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" />

-    <Import Project="..\..\..\debug.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />

-    <Import Project="..\..\..\release.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp
index 4855bf443..b830202dd 100644
--- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp
@@ -1588,13 +1588,6 @@ STDMETHODIMP_(bool) CDX9AllocatorPresenter::Paint(bool fAll)
 		DrawStats();

 	}

 

-	{

-		CString Temp;

-		Temp.Format(L"GPU %7.3f ms", (double(m_WaitForGPUTime)/10000.0));

-

-		//TRACE("%ws\n", Temp.GetString());

-	}

-

 	if (m_pOSDTexture) {

 		AlphaBlt(rSrcPri, rDstPri, m_pOSDTexture);

 	}

diff --git a/src/filters/renderer/VideoRenderers/IPinHook.cpp b/src/filters/renderer/VideoRenderers/IPinHook.cpp
index e1420fd6e..82be6e783 100644
--- a/src/filters/renderer/VideoRenderers/IPinHook.cpp
+++ b/src/filters/renderer/VideoRenderers/IPinHook.cpp
@@ -1305,7 +1305,7 @@ interface IDirectXVideoDecoderServiceC {
 };

 

 

-IDirectXVideoDecoderServiceCVtbl*	g_pIDirectXVideoDecoderServiceCVtbl;

+IDirectXVideoDecoderServiceCVtbl*	g_pIDirectXVideoDecoderServiceCVtbl = NULL;

 static HRESULT (STDMETHODCALLTYPE* CreateVideoDecoderOrg )  (IDirectXVideoDecoderServiceC* pThis, __in  REFGUID Guid, __in  const DXVA2_VideoDesc* pVideoDesc, __in  const DXVA2_ConfigPictureDecode* pConfig, __in_ecount(NumRenderTargets)  IDirect3DSurface9 **ppDecoderRenderTargets, __in  UINT NumRenderTargets, __deref_out  IDirectXVideoDecoder** ppDecode) = NULL;

 static HRESULT (STDMETHODCALLTYPE* GetDecoderDeviceGuidsOrg)(IDirectXVideoDecoderServiceC* pThis, __out  UINT* pCount, __deref_out_ecount_opt(*pCount)  GUID** pGuids) = NULL;

 static HRESULT (STDMETHODCALLTYPE* GetDecoderConfigurationsOrg) (IDirectXVideoDecoderServiceC* pThis, __in  REFGUID Guid, __in const DXVA2_VideoDesc* pVideoDesc, __reserved void* pReserved, __out UINT* pCount, __deref_out_ecount_opt(*pCount)  DXVA2_ConfigPictureDecode **ppConfigs) = NULL;

@@ -1439,6 +1439,7 @@ static HRESULT STDMETHODCALLTYPE CreateVideoDecoderMine(
 #endif

 	}

 

+	TRACE(_T("DXVA Decoder : %s\n"), GetDXVADecoderDescription());

 	LOG(_T("IDirectXVideoDecoderService::CreateVideoDecoder  %s  (%d render targets) hr = %08x"), GetDXVAMode(&g_guidDXVADecoder), NumRenderTargets, hr);

 

 	return hr;

@@ -1510,7 +1511,7 @@ void HookDirectXVideoDecoderService(void* pIDirectXVideoDecoderService)
 	::DeleteFile (_T("slicelong.log"));

 #endif

 

-	if (pIDirectXVideoDecoderService) {

+	if (!g_pIDirectXVideoDecoderServiceCVtbl && pIDirectXVideoDecoderService) {

 		res = VirtualProtect(pIDirectXVideoDecoderServiceC->lpVtbl, sizeof(IDirectXVideoDecoderServiceCVtbl), PAGE_WRITECOPY, &flOldProtect);

 

 		CreateVideoDecoderOrg = pIDirectXVideoDecoderServiceC->lpVtbl->CreateVideoDecoder;

diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
index 6a84b881a..64047b160 100644
--- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
+++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
@@ -133,7 +133,7 @@ CBaseAP::CBaseAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString &_Error):
 #endif

 

 	if (m_pDirect3DCreate9Ex) {

-		_tprintf(_T("m_pDirect3DCreate9Ex\n"));

+		DEBUG_ONLY(_tprintf(_T("m_pDirect3DCreate9Ex\n")));

 		m_pDirect3DCreate9Ex(D3D_SDK_VERSION, &m_pD3DEx);

 		if(!m_pD3DEx) {

 			m_pDirect3DCreate9Ex(D3D9b_SDK_VERSION, &m_pD3DEx);

@@ -145,7 +145,7 @@ CBaseAP::CBaseAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString &_Error):
 			m_pD3D.Attach(Direct3DCreate9(D3D9b_SDK_VERSION));

 		}

 		if(m_pD3D) {

-			_tprintf(_T("m_pDirect3DCreate9\n"));

+			DEBUG_ONLY(_tprintf(_T("m_pDirect3DCreate9\n")));

 		}

 	} else {

 		m_pD3D = m_pD3DEx;

@@ -447,7 +447,7 @@ HRESULT CBaseAP::CreateDXDevice(CString &_Error)
 		pp.BackBufferWidth = d3ddm.Width;

 		pp.BackBufferHeight = d3ddm.Height;

 		pp.hDeviceWindow = m_hWnd;

-		_tprintf(_T("Wnd in CreateDXDevice: %d\n"), m_hWnd);

+		DEBUG_ONLY(_tprintf(_T("Wnd in CreateDXDevice: %d\n"), m_hWnd));

 		pp.BackBufferCount = 3;

 		pp.SwapEffect = D3DSWAPEFFECT_DISCARD;

 		pp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;

@@ -491,7 +491,7 @@ HRESULT CBaseAP::CreateDXDevice(CString &_Error)
 				_Error += GetWindowsErrorMessage(hr, m_hD3D9);

 				return hr;

 			}

-			_tprintf(_T("Created full-screen device\n"));

+			DEBUG_ONLY(_tprintf(_T("Created full-screen device\n")));

 			if (m_pD3DDev) {

 				m_BackbufferType = pp.BackBufferFormat;

 				m_DisplayType = d3ddm.Format;

@@ -542,7 +542,7 @@ HRESULT CBaseAP::CreateDXDevice(CString &_Error)
 				_Error += GetWindowsErrorMessage(hr, m_hD3D9);

 				return hr;

 			}

-			_tprintf(_T("Created windowed device\n"));

+			DEBUG_ONLY(_tprintf(_T("Created windowed device\n")));

 		}

 	}

 

@@ -620,7 +620,7 @@ HRESULT CBaseAP::CreateDXDevice(CString &_Error)
 

 	CComPtr<ISubPicProvider> pSubPicProvider;

 	if(m_pSubPicQueue) {

-		_tprintf(_T("m_pSubPicQueue != NULL\n"));

+		DEBUG_ONLY(_tprintf(_T("m_pSubPicQueue != NULL\n")));

 		m_pSubPicQueue->GetSubPicProvider(&pSubPicProvider);

 	}

 

@@ -681,7 +681,7 @@ HRESULT CBaseAP::ResetDXDevice(CString &_Error)
 			CComPtr<IPin> input;

 			CComPtr<IPin> output;

 			while (hr = rendererInputEnum->Next(1, &input.p, 0), hr == S_OK) { // Must have .p here

-				_tprintf(_T("Pin found\n"));

+				DEBUG_ONLY(_tprintf(_T("Pin found\n")));

 				input->ConnectedTo(&output.p);

 				if (output != NULL) {

 					rendererInput.push_back(input);

@@ -694,10 +694,10 @@ HRESULT CBaseAP::ResetDXDevice(CString &_Error)
 			return hr;

 		}

 		for (DWORD i = 0; i < decoderOutput.size(); i++) {

-			_tprintf(_T("Disconnecting pin\n"));

+			DEBUG_ONLY(_tprintf(_T("Disconnecting pin\n")));

 			filterInfo.pGraph->Disconnect(decoderOutput.at(i).p);

 			filterInfo.pGraph->Disconnect(rendererInput.at(i).p);

-			_tprintf(_T("Pin disconnected\n"));

+			DEBUG_ONLY(_tprintf(_T("Pin disconnected\n")));

 		}

 		disconnected = true;

 	}

@@ -1773,7 +1773,7 @@ STDMETHODIMP_(bool) CBaseAP::Paint(bool fAll)
 		}

 	}

 	if(FAILED(hr)) {

-		_tprintf(_T("Device lost or something\n"));

+		DEBUG_ONLY(_tprintf(_T("Device lost or something\n")));

 	}

 	// Calculate timing statistics

 	if (m_pRefClock) {

diff --git a/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj b/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj
index 61200eeaa..3967123e4 100644
--- a/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj
+++ b/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj
@@ -54,22 +54,18 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

-    <Import Project="..\..\..\debug.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

-    <Import Project="..\..\..\release.props" />

   </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" />

-    <Import Project="..\..\..\debug.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />

-    <Import Project="..\..\..\release.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>