Graph with EVR renderer fixed

Minor fixes

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

3 files changed, 11 insertions, 43 deletions

diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
index 6c5bc8de4..c3ec0e813 100644
--- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
+++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
@@ -1600,7 +1600,8 @@ HRESULT CBaseAP::AlphaBlt(RECT* pSrc, RECT* pDst, IDirect3DTexture9* pTexture)
 void CBaseAP::SyncStats(LONGLONG syncTime)

 {

     m_nNextJitter = (m_nNextJitter+1) % NB_JITTER;

-    m_pllJitter[m_nNextJitter] = syncTime - m_llLastSyncTime;

+	LONGLONG jitter = syncTime - m_llLastSyncTime;

+    m_pllJitter[m_nNextJitter] = jitter;

     double syncDeviation = ((double)m_pllJitter[m_nNextJitter] - m_fJitterMean) / 10000.0;

     if (abs(syncDeviation) > (GetDisplayCycle() / 2))

         m_uSyncGlitches++;

@@ -1705,7 +1706,8 @@ STDMETHODIMP_(bool) CBaseAP::Paint(bool fAll)
     m_pD3DDev->GetRasterStatus(0, &rasterStatus);

     m_uScanLineEnteringPaint = rasterStatus.ScanLine;

     if (m_pRefClock) m_pRefClock->GetTime(&llCurRefTime);

-    dSyncOffset = (m_ScreenSize.cy - m_uScanLineEnteringPaint) * m_dDetectedScanlineTime; // ms

+	int dScanLines = max((int)m_ScreenSize.cy - m_uScanLineEnteringPaint, 0);

+    dSyncOffset = dScanLines * m_dDetectedScanlineTime; // ms

     llSyncOffset = REFERENCE_TIME(10000.0 * dSyncOffset); // Reference time units (100 ns)

     m_llEstVBlankTime = llCurRefTime + llSyncOffset; // Estimated time for the start of next vblank

 

diff --git a/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj b/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj
index 2beebbc58..29b8ac30f 100644
--- a/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj
+++ b/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj
@@ -128,7 +128,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_WINDOWS;DETOURS_X64"

 				BufferSecurityCheck="true"

 				EnableEnhancedInstructionSet="0"

@@ -201,7 +201,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DETOURS_X32"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

@@ -271,7 +271,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\..\..\include\dx;..\..\..\..\include\atl;..\..\BaseClasses;..\..\..\zlib"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS;DETOURS_X64"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

diff --git a/src/filters/renderer/VideoRenderers/stdafx.h b/src/filters/renderer/VideoRenderers/stdafx.h
index d1cc4cb4c..f7470f231 100644
--- a/src/filters/renderer/VideoRenderers/stdafx.h
+++ b/src/filters/renderer/VideoRenderers/stdafx.h
@@ -24,45 +24,24 @@
  *

  */

 

-#if !defined(AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_)

-#define AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_

+#if !defined(AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07225__INCLUDED_)

+#define AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07225__INCLUDED_

 

 #if _MSC_VER > 1000

 #pragma once

 #endif // _MSC_VER > 1000

 #include "../../../DSUtil/SharedInclude.h"

 

-// VS2005 changed result of OnNCHitTest

-#if _MSC_VER >= 1400

-#define HITTEST_RET LRESULT

-#else

-#define HITTEST_RET UINT

-#endif

-

 //#define _WIN32_IE		0x0600

 #define WINVER			0x0600

 

 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers

 

-#include <afxwin.h>         // MFC core and standard components

-#include <afxext.h>         // MFC extensions

-#include <afxdisp.h>        // MFC Automation classes

-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls

-#ifndef _AFX_NO_AFXCMN_SUPPORT

-#include <afxcmn.h>			// MFC support for Windows Common Controls

-#endif // _AFX_NO_AFXCMN_SUPPORT

-#include <afxdlgs.h>

-

 #define ResStr(id) CString(MAKEINTRESOURCE(id))

 

 #include <afxdisp.h>

 #include <afxole.h>

 

-#include <Shlwapi.h>

-

-#include <atlcoll.h>

-#include <atlpath.h>

-

 #include <streams.h>

 #include <dvdmedia.h>

 #include <mpconfig.h>

@@ -70,22 +49,9 @@
 #include <qt/qt.h>

 #endif

 

-#include "../../ui/ui.h"

-#include "../DSUtil/DSUtil.h"

-

-#include <gdiplus.h>

-#pragma comment(lib, "gdiplus.lib")

-

-template <class T = CString, class S = CString>

-class CAtlStringMap : public CAtlMap<S, T, CStringElementTraits<S> > {};

-

-#define CheckAndLog(x, msg)		hr = ##x; if (FAILED (hr)) { TRACE(msg" : 0x%08x\n", hr); return hr; }

-#define CheckNoLog(x)			hr = ##x; if (FAILED (hr)) { return hr; }

-

-

-//#define BCM_SETSHIELD				0x0000160C		// Shield style for button (elevated privilege)

+#include "../../../DSUtil/DSUtil.h"

 

 //{{AFX_INSERT_LOCATION}}

 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.

 

-#endif // !defined(AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_)

+#endif // !defined(AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07225__INCLUDED_)