DX9: Косметика кода.

Author: v0lt

Source/DX9VideoProcessor.cpp

@@ -1051,7 +1051,7 @@ BOOL CDX9VideoProcessor::GetAlignmentSize(const CMediaType& mt, SIZE& Size)
 		else {
 			CComPtr<IDirect3DSurface9> pSurface;
 			if (m_DXVA2VP.IsReady()) {
-				pSurface = m_DXVA2VP.GetNextInputSurface(0, 0, m_CurrentSampleFmt);
+				pSurface = m_DXVA2VP.GetNextInputSurface(0, m_CurrentSampleFmt);
 			} else {
 				pSurface = m_TexSrcVideo.pSurface;
 			}
@@ -1431,14 +1431,11 @@ HRESULT CDX9VideoProcessor::CopySample(IMediaSample* pSample)
 			}
 
 			if (m_DXVA2VP.IsReady()) {
-				const REFERENCE_TIME start_100ns = m_pFilter->m_FrameStats.GetFrames() * 170000i64;
-				const REFERENCE_TIME end_100ns = start_100ns + 170000i64;
-
 				if (m_DXVA2VP.GetNumRefSamples() > 1) {
-					IDirect3DSurface9* pDXVA2VPSurface = m_DXVA2VP.GetNextInputSurface(start_100ns, end_100ns, m_CurrentSampleFmt);
+					IDirect3DSurface9* pDXVA2VPSurface = m_DXVA2VP.GetNextInputSurface(m_pFilter->m_FrameStats.GetFrames(), m_CurrentSampleFmt);
 					hr = m_pD3DDevEx->StretchRect(pSurface, nullptr, pDXVA2VPSurface, nullptr, D3DTEXF_NONE);
 				} else {
-					m_DXVA2VP.SetInputSurface(pSurface, start_100ns, end_100ns, m_CurrentSampleFmt);
+					m_DXVA2VP.SetInputSurface(pSurface, m_pFilter->m_FrameStats.GetFrames(), m_CurrentSampleFmt);
 				}
 			}
 			else if (m_TexSrcVideo.Plane2.pSurface) {
@@ -1477,10 +1474,7 @@ HRESULT CDX9VideoProcessor::CopySample(IMediaSample* pSample)
 			D3DLOCKED_RECT lr;
 
 			if (m_DXVA2VP.IsReady()) {
-				const REFERENCE_TIME start_100ns = m_pFilter->m_FrameStats.GetFrames() * 170000i64;
-				const REFERENCE_TIME end_100ns = start_100ns + 170000i64;
-
-				IDirect3DSurface9* pDXVA2VPSurface = m_DXVA2VP.GetNextInputSurface(start_100ns, end_100ns, m_CurrentSampleFmt);
+				IDirect3DSurface9* pDXVA2VPSurface = m_DXVA2VP.GetNextInputSurface(m_pFilter->m_FrameStats.GetFrames(), m_CurrentSampleFmt);
 
 				hr = pDXVA2VPSurface->LockRect(&lr, nullptr, D3DLOCK_DISCARD|D3DLOCK_NOSYSLOCK);
 				if (S_OK == hr) {

Source/DXVA2VP.cpp

@@ -382,14 +382,14 @@ void CDXVA2VP::ReleaseVideoProcessor()
 	m_srcHeight   = 0;
 }
 
-HRESULT CDXVA2VP::SetInputSurface(IDirect3DSurface9* pSurface, const REFERENCE_TIME start, const REFERENCE_TIME end, const DXVA2_SampleFormat sampleFmt)
+HRESULT CDXVA2VP::SetInputSurface(IDirect3DSurface9* pSurface, const UINT frameNum, const DXVA2_SampleFormat sampleFmt)
 {
 	CheckPointer(pSurface, E_POINTER);
 
 	DXVA2_VideoSample* videoSample = m_VideoSamples.GetNextVideoSample();
 	if (videoSample) {
-		videoSample->Start = start;
-		videoSample->End = end;
+		videoSample->Start = frameNum * 170000i64;
+		videoSample->End   = videoSample->Start + 170000i64;
 		videoSample->SampleFormat.SampleFormat = sampleFmt;
 
 		if (videoSample->SrcSurface) {
@@ -435,12 +435,12 @@ IDirect3DSurface9* CDXVA2VP::GetInputSurface()
 	return *ppSurface;
 }
 
-IDirect3DSurface9* CDXVA2VP::GetNextInputSurface(const REFERENCE_TIME start, const REFERENCE_TIME end, const DXVA2_SampleFormat sampleFmt)
+IDirect3DSurface9* CDXVA2VP::GetNextInputSurface(const UINT frameNum, const DXVA2_SampleFormat sampleFmt)
 {
 	DXVA2_VideoSample* videoSample = m_VideoSamples.GetNextVideoSample();
 	if (videoSample) {
-		videoSample->Start = start;
-		videoSample->End = end;
+		videoSample->Start = frameNum * 170000i64;
+		videoSample->End   = videoSample->Start + 170000i64;
 		videoSample->SampleFormat.SampleFormat = sampleFmt;
 	}
 

Source/DXVA2VP.h

@@ -172,9 +172,9 @@ class CDXVA2VP
 	UINT GetNumRefSamples() { return m_NumRefSamples; }
 	void GetVPParams(GUID& guid, DXVA2_VideoProcessorCaps& caps) { guid = m_DXVA2VPGuid; caps = m_DXVA2VPcaps; }
 
-	HRESULT SetInputSurface(IDirect3DSurface9* pSurface, const REFERENCE_TIME start, const REFERENCE_TIME end, const DXVA2_SampleFormat sampleFmt);
+	HRESULT SetInputSurface(IDirect3DSurface9* pSurface, const UINT frameNum, const DXVA2_SampleFormat sampleFmt);
 	IDirect3DSurface9* GetInputSurface();
-	IDirect3DSurface9* GetNextInputSurface(const REFERENCE_TIME start, const REFERENCE_TIME end, const DXVA2_SampleFormat sampleFmt);
+	IDirect3DSurface9* GetNextInputSurface(const UINT frameNum, const DXVA2_SampleFormat sampleFmt);
 	void ClearInputSurfaces(const DXVA2_ExtendedFormat exFmt);
 	void CleanSamplesData();