Не вызываем CVideoProcessor::InitMediaType, когда это не требуется.

Aleksoid1978 · v0lt · commit f6fe2b467a44 · 2025-04-13T08:35:31.000+03:00
diff --git a/Source/DX9VideoProcessor.cpp b/Source/DX9VideoProcessor.cpp
@@ -1034,7 +1034,7 @@ BOOL CDX9VideoProcessor::VerifyMediaType(const CMediaType* pmt)
 
 BOOL CDX9VideoProcessor::GetAlignmentSize(const CMediaType& mt, SIZE& Size)
 {
-	if (InitMediaType(&mt)) {
+	if ((m_srcDXVA2Format != D3DFMT_UNKNOWN && mt == m_pFilter->m_inputMT) || InitMediaType(&mt)) {
 		const auto& FmtParams = GetFmtConvParams(&mt);
 
 		if (FmtParams.cformat == CF_RGB24) {
diff --git a/Source/VideoRenderer.cpp b/Source/VideoRenderer.cpp
@@ -445,7 +445,7 @@ HRESULT CMpcVideoRenderer::SetMediaType(const CMediaType *pmt)
 		}
 	}
 
-	if (!m_VideoProcessor->InitMediaType(&mt)) {
+	if (mt != m_inputMT && !m_VideoProcessor->InitMediaType(&mt)) {
 		return VFW_E_UNSUPPORTED_VIDEO;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,7 @@ BOOL CDX9VideoProcessor::VerifyMediaType(const CMediaType* pmt)`
`1034`	`1034`
`1035`	`1035`	`BOOL CDX9VideoProcessor::GetAlignmentSize(const CMediaType& mt, SIZE& Size)`
`1036`	`1036`	`{`
`1037`		`- if (InitMediaType(&mt)) {`
	`1037`	`+ if ((m_srcDXVA2Format != D3DFMT_UNKNOWN && mt == m_pFilter->m_inputMT) \|\| InitMediaType(&mt)) {`
`1038`	`1038`	`const auto& FmtParams = GetFmtConvParams(&mt);`
`1039`	`1039`
`1040`	`1040`	`if (FmtParams.cformat == CF_RGB24) {`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ HRESULT CMpcVideoRenderer::SetMediaType(const CMediaType *pmt)`
`445`	`445`	`}`
`446`	`446`	`}`
`447`	`447`
`448`		`- if (!m_VideoProcessor->InitMediaType(&mt)) {`
	`448`	`+ if (mt != m_inputMT && !m_VideoProcessor->InitMediaType(&mt)) {`
`449`	`449`	`return VFW_E_UNSUPPORTED_VIDEO;`
`450`	`450`	`}`
`451`	`451`