DX9: Переделка GetNextInternalSampleInfo в GetNextInternalSurface для упрощения кода.

v0lt · v0lt · commit 645fece067f9 · 2025-07-20T07:30:47.000+03:00
diff --git a/Source/DXVA2VP.cpp b/Source/DXVA2VP.cpp
@@ -420,9 +420,7 @@ IDirect3DSurface9* CDXVA2VP::GetNextInputSurface(const UINT frameNum, const DXVA
 		}
 	}
 
-	auto sample = m_VideoSamples.GetNextInternalSampleInfo(frameNum, sampleFmt, pSurface);
-
-	return sample ? sample->pSrcSurface.p : nullptr;
+	return m_VideoSamples.GetNextInternalSurface(frameNum, sampleFmt, pSurface);
 }
 
 void CDXVA2VP::CleanSamples()
diff --git a/Source/DXVA2VP.h b/Source/DXVA2VP.h
@@ -132,7 +132,7 @@ class VideoSampleBuffer
 		if (m_exFmt.VideoTransferFunction > DXVA2_VideoTransFunc_28) { m_exFmt.VideoTransferFunction = DXVA2_VideoTransFunc_709; }
 	}
 
-	DXVA2_SampleInfo* GetNextInternalSampleInfo(const UINT frameNum, const DXVA2_SampleFormat sampleFmt, IDirect3DSurface9* pSurface)
+	IDirect3DSurface9* GetNextInternalSurface(const UINT frameNum, const DXVA2_SampleFormat sampleFmt, IDirect3DSurface9* pSurface)
 	{
 		if (!m_maxSize) {
 			return nullptr;
@@ -154,7 +154,7 @@ class VideoSampleBuffer
 
 		UpdateDXVA2Samples();
 
-		return &sample;
+		return sample.pSrcSurface;
 	}
 
 	void AddExternalSampleInfo(IMediaSample* pSample, const UINT frameNum, const DXVA2_SampleFormat sampleFmt, IDirect3DSurface9* pSrcSurface)

Original file line number	Diff line number	Diff line change
`@@ -420,9 +420,7 @@ IDirect3DSurface9* CDXVA2VP::GetNextInputSurface(const UINT frameNum, const DXVA`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`
`423`		`- auto sample = m_VideoSamples.GetNextInternalSampleInfo(frameNum, sampleFmt, pSurface);`
`424`		`-`
`425`		`- return sample ? sample->pSrcSurface.p : nullptr;`
	`423`	`+ return m_VideoSamples.GetNextInternalSurface(frameNum, sampleFmt, pSurface);`
`426`	`424`	`}`
`427`	`425`
`428`	`426`	`void CDXVA2VP::CleanSamples()`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ class VideoSampleBuffer`
`132`	`132`	`if (m_exFmt.VideoTransferFunction > DXVA2_VideoTransFunc_28) { m_exFmt.VideoTransferFunction = DXVA2_VideoTransFunc_709; }`
`133`	`133`	`}`
`134`	`134`
`135`		`- DXVA2_SampleInfo* GetNextInternalSampleInfo(const UINT frameNum, const DXVA2_SampleFormat sampleFmt, IDirect3DSurface9* pSurface)`
	`135`	`+ IDirect3DSurface9* GetNextInternalSurface(const UINT frameNum, const DXVA2_SampleFormat sampleFmt, IDirect3DSurface9* pSurface)`
`136`	`136`	`{`
`137`	`137`	`if (!m_maxSize) {`
`138`	`138`	`return nullptr;`
`@@ -154,7 +154,7 @@ class VideoSampleBuffer`
`154`	`154`
`155`	`155`	`UpdateDXVA2Samples();`
`156`	`156`
`157`		`- return &sample;`
	`157`	`+ return sample.pSrcSurface;`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`void AddExternalSampleInfo(IMediaSample* pSample, const UINT frameNum, const DXVA2_SampleFormat sampleFmt, IDirect3DSurface9* pSrcSurface)`