fix: 修复色域切换 bug

Blinue · Blinue · commit 17497bbfe99f · 2025-12-31T18:42:50.000+08:00
diff --git a/src/Magpie.Core/CatmullRomEffectDrawer.cpp b/src/Magpie.Core/CatmullRomEffectDrawer.cpp
@@ -93,22 +93,13 @@ HRESULT CatmullRomEffectDrawer::Initialize(
 		}
 	}
 
-	{
-		D3D12_COMPUTE_PIPELINE_STATE_DESC psoDesc = {
-			.pRootSignature = _rootSignature.get(),
-			.CS = CD3DX12_SHADER_BYTECODE(
-				_outputColorSpace == EffectColorSpace::sRGB ? CatmullRomCS_sRGB : CatmullRomCS,
-				_outputColorSpace == EffectColorSpace::sRGB ? sizeof(CatmullRomCS_sRGB) : sizeof(CatmullRomCS)
-			)
-		};
-		HRESULT hr = device->CreateComputePipelineState(&psoDesc, IID_PPV_ARGS(&_pipelineState));
-		if (FAILED(hr)) {
-			Logger::Get().ComError("CreateComputePipelineState 失败", hr);
-			return hr;
-		}
+	HRESULT hr = _CreatePiplineState();
+	if (FAILED(hr)) {
+		Logger::Get().ComError("_CreatePiplineState 失败", hr);
+		return hr;
 	}
 
-	_CreateDisplayDependentResources(
+	_CreateDescriptors(
 		descriptorCpuHandle, descriptorGpuHandle, descriptorSize, inputResource, outputResource);
 
 	return S_OK;
@@ -165,11 +156,11 @@ void CatmullRomEffectDrawer::OnResized(
 	_inputSize = inputSize;
 	_outputSize = outputSize;
 
-	_CreateDisplayDependentResources(
+	_CreateDescriptors(
 		descriptorCpuHandle, descriptorGpuHandle, descriptorSize, inputResource, outputResource);
 }
 
-void CatmullRomEffectDrawer::OnColorInfoChanged(
+HRESULT CatmullRomEffectDrawer::OnColorInfoChanged(
 	EffectColorSpace inputColorSpace,
 	EffectColorSpace outputColorSpace,
 	CD3DX12_CPU_DESCRIPTOR_HANDLE& descriptorCpuHandle,
@@ -179,16 +170,47 @@ void CatmullRomEffectDrawer::OnColorInfoChanged(
 	ID3D12Resource* outputResource
 ) noexcept {
 	if (_inputColorSpace == inputColorSpace && _outputColorSpace == outputColorSpace) {
-		return;
+		return S_OK;
 	}
+
 	_inputColorSpace = inputColorSpace;
-	_outputColorSpace = outputColorSpace;
 
-	_CreateDisplayDependentResources(
-		descriptorCpuHandle, descriptorGpuHandle, descriptorSize, inputResource, outputResource);
+	if (_outputColorSpace != outputColorSpace) {
+		_outputColorSpace = outputColorSpace;
+
+		HRESULT hr = _CreatePiplineState();
+		if (FAILED(hr)) {
+			Logger::Get().ComError("_CreatePiplineState 失败", hr);
+			return hr;
+		}
+	}
+	
+	_CreateDescriptors(descriptorCpuHandle, descriptorGpuHandle,
+		descriptorSize, inputResource, outputResource);
+
+	return S_OK;
+}
+
+HRESULT CatmullRomEffectDrawer::_CreatePiplineState() noexcept {
+	ID3D12Device5* device = _graphicsContext->GetDevice();
+
+	D3D12_COMPUTE_PIPELINE_STATE_DESC psoDesc = {
+		.pRootSignature = _rootSignature.get(),
+		.CS = CD3DX12_SHADER_BYTECODE(
+			_outputColorSpace == EffectColorSpace::sRGB ? CatmullRomCS_sRGB : CatmullRomCS,
+			_outputColorSpace == EffectColorSpace::sRGB ? sizeof(CatmullRomCS_sRGB) : sizeof(CatmullRomCS)
+		)
+	};
+	HRESULT hr = device->CreateComputePipelineState(&psoDesc, IID_PPV_ARGS(&_pipelineState));
+	if (FAILED(hr)) {
+		Logger::Get().ComError("CreateComputePipelineState 失败", hr);
+		return hr;
+	}
+
+	return S_OK;
 }
 
-void CatmullRomEffectDrawer::_CreateDisplayDependentResources(
+void CatmullRomEffectDrawer::_CreateDescriptors(
 	CD3DX12_CPU_DESCRIPTOR_HANDLE& descriptorCpuHandle,
 	CD3DX12_GPU_DESCRIPTOR_HANDLE& descriptorGpuHandle,
 	uint32_t descriptorSize,
diff --git a/src/Magpie.Core/CatmullRomEffectDrawer.h b/src/Magpie.Core/CatmullRomEffectDrawer.h
@@ -46,7 +46,7 @@ class CatmullRomEffectDrawer : public EffectDrawerBase {
 		ID3D12Resource* outputResource
 	) noexcept;
 
-	void OnColorInfoChanged(
+	HRESULT OnColorInfoChanged(
 		EffectColorSpace inputColorSpace,
 		EffectColorSpace outputColorSpace,
 		CD3DX12_CPU_DESCRIPTOR_HANDLE& descriptorCpuHandle,
@@ -57,7 +57,9 @@ class CatmullRomEffectDrawer : public EffectDrawerBase {
 	) noexcept;
 
 private:
-	void _CreateDisplayDependentResources(
+	HRESULT _CreatePiplineState() noexcept;
+
+	void _CreateDescriptors(
 		CD3DX12_CPU_DESCRIPTOR_HANDLE& descriptorCpuHandle,
 		CD3DX12_GPU_DESCRIPTOR_HANDLE& descriptorGpuHandle,
 		uint32_t descriptorSize,
diff --git a/src/Magpie.Core/EffectsDrawer.cpp b/src/Magpie.Core/EffectsDrawer.cpp
@@ -226,9 +226,13 @@ HRESULT EffectsDrawer::OnColorInfoChanged(
 		EffectColorSpace::sRGB : EffectColorSpace::scRGB;
 	CD3DX12_CPU_DESCRIPTOR_HANDLE descriptorCpuHandle = _effectsDescriptorCpuBase;
 	CD3DX12_GPU_DESCRIPTOR_HANDLE descriptorGpuHandle = _effectsDescriptorGpuBase;
-	_catmullRom.OnColorInfoChanged(colorSpace, colorSpace, descriptorCpuHandle,
+	HRESULT hr = _catmullRom.OnColorInfoChanged(colorSpace, colorSpace, descriptorCpuHandle,
 		descriptorGpuHandle, _descriptorSize, nullptr, nullptr);
-	
+	if (FAILED(hr)) {
+		Logger::Get().ComError("CatmullRomEffectDrawer::OnColorInfoChanged 失败", hr);
+		return hr;
+	}
+
 	return S_OK;
 }
 
diff --git a/src/Magpie.Core/FrameProducer.cpp b/src/Magpie.Core/FrameProducer.cpp
@@ -161,7 +161,9 @@ void FrameProducer::OnColorInfoChangedAsync(
 				return;
 			}
 
-			_frameRingBuffer.UpdateResources(outputResources);
+			if (!outputResources.empty()) {
+				_frameRingBuffer.UpdateResources(outputResources);
+			}
 		}
 
 		// 等待新帧
@@ -218,11 +220,9 @@ void FrameProducer::_ProducerThreadProc(
 	if (_Initialize(colorInfo, hMonSrc, srcRect, rendererSize, outputSize)) {
 		// 同步 outputSize
 		task.SetResult(true, std::memory_order_release);
-		_state.store(ComponentState::NoError, std::memory_order_release);
 	} else {
 		Logger::Get().Error("_Initialize 失败");
 		task.SetResult(false);
-		_state.store(ComponentState::Error, std::memory_order_relaxed);
 		return;
 	}
 
diff --git a/src/Magpie.Core/FrameProducer.h b/src/Magpie.Core/FrameProducer.h
@@ -68,7 +68,7 @@ class FrameProducer {
 
 	bool _CheckResult(HRESULT hr, std::string_view errorMsg) noexcept;
 
-	std::atomic<ComponentState> _state = ComponentState::Initializing;
+	std::atomic<ComponentState> _state = ComponentState::NoError;
 
 	std::thread _producerThread;
 	winrt::DispatcherQueue _dispatcher{ nullptr };
diff --git a/src/Magpie.Core/GraphicsCaptureFrameSource.cpp b/src/Magpie.Core/GraphicsCaptureFrameSource.cpp
@@ -327,18 +327,15 @@ HRESULT GraphicsCaptureFrameSource::CheckForNewFrame(bool& isNewFrameAvailable)
 			return hr;
 		}
 
-		if (_captureFrameResourceTable.empty()) {
-			// 丢弃 Recreate 后收到的旧帧，WGC 内部没做同步
+#ifdef _DEBUG
+		{
 			D3D11_TEXTURE2D_DESC desc;
 			d3d11Texture->GetDesc(&desc);
 			const DXGI_FORMAT expectedFormat =
 				_isScRGB ? DXGI_FORMAT_R16G16B16A16_FLOAT : DXGI_FORMAT_B8G8R8A8_UNORM;
-			if (desc.Format != expectedFormat) {
-				_newFrame = nullptr;
-				isNewFrameAvailable = false;
-				return S_OK;
-			}
+			assert(desc.Format == expectedFormat);
 		}
+#endif
 		
 		// 目前 WGC 帧池不会变化，因此可以缓存，需要采取保护措施防止内部实现变化
 		auto it = std::find_if(
@@ -630,20 +627,16 @@ HRESULT GraphicsCaptureFrameSource::OnColorInfoChanged(const ColorInfo& colorInf
 		return S_OK;
 	}
 
-	_ReleaseCaptureFrames();
+	// 重启捕获而不是 Recreate，这样可以立刻获得新帧
+	_StopCapture();
 
-	try {
-		winrt::DirectXPixelFormat format = _isScRGB ? winrt::DirectXPixelFormat::R16G16B16A16Float :
-			winrt::DirectXPixelFormat::B8G8R8A8UIntNormalized;
-		_captureFramePool.Recreate(_wrappedDevice, format, CalcCaptureFrameCount(),
-			{ (int)_frameBox.right, (int)_frameBox.bottom });
-	} catch (const winrt::hresult_error& e) {
-		Logger::Get().ComInfo(StrHelper::Concat("Direct3D11CaptureFramePool::Recreate 失败: ",
-			StrHelper::UTF16ToUTF8(e.message())), e.code());
-		return e.code();
+	HRESULT hr = _StartCapture();
+	if (FAILED(hr)) {
+		Logger::Get().ComError("_StartCapture 失败", hr);
+		return hr;
 	}
-
-	HRESULT hr = _CreateDisplayDependentResources();
+	
+	hr = _CreateDisplayDependentResources();
 	if (FAILED(hr)) {
 		Logger::Get().ComError("_CreateDisplayDependentResources 失败", hr);
 		return hr;
@@ -1276,17 +1269,11 @@ void GraphicsCaptureFrameSource::_StopCapture() noexcept {
 	_captureFramePool.Close();
 	_captureFramePool = nullptr;
 
-	_ReleaseCaptureFrames();
-}
-
-void GraphicsCaptureFrameSource::_ReleaseCaptureFrames() noexcept {
+	// 捕获已结束，可以安全操作 _latestFrame
 	{
-		winrt::Direct3D11CaptureFrame frame{ nullptr };
-		{
-			auto lk = _latestFrameLock.lock_exclusive();
-			frame = std::move(_latestFrame);
-			_latestFrameDirtyRects.clear();
-		}
+		auto lk = _latestFrameLock.lock_exclusive();
+		_latestFrame = nullptr;
+		_latestFrameDirtyRects.clear();
 	}
 
 	_captureFrameResourceTable.clear();
diff --git a/src/Magpie.Core/GraphicsCaptureFrameSource.h b/src/Magpie.Core/GraphicsCaptureFrameSource.h
@@ -69,8 +69,6 @@ class GraphicsCaptureFrameSource {
 
 	void _StopCapture() noexcept;
 
-	void _ReleaseCaptureFrames() noexcept;
-
 	GraphicsContext* _graphicsContext = nullptr;
 
 	std::atomic<DWORD> _producerThreadId;
@@ -92,6 +90,8 @@ class GraphicsCaptureFrameSource {
 	uint64_t _curCrossAdapterFenceValue = 0;
 
 	wil::srwlock _latestFrameLock;
+	// 不要在持有 _latestFrameLock 时释放 _latestFrame 或调用其中的方法，和 WGC 内部的
+	// 同步机制冲突。如果此时_Direct3D11CaptureFramePool_FrameArrived 正在执行会死锁。
 	winrt::Windows::Graphics::Capture::Direct3D11CaptureFrame _latestFrame{ nullptr };
 	SmallVector<Rect> _latestFrameDirtyRects;
 
diff --git a/src/Magpie.Core/pch.h b/src/Magpie.Core/pch.h
@@ -71,7 +71,6 @@ static constexpr uint32_t MAX_CAPTURE_DIRTY_RECT_COUNT = 4;
 static constexpr uint32_t DUP_FRAME_DISPATCH_BLOCK_SIZE = 16;
 
 enum class ComponentState {
-	Initializing,
 	NoError,
 	DeviceLost,
 	Error

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,9 @@ void FrameProducer::OnColorInfoChangedAsync(`
`161`	`161`	`return;`
`162`	`162`	`}`
`163`	`163`
`164`		`- _frameRingBuffer.UpdateResources(outputResources);`
	`164`	`+ if (!outputResources.empty()) {`
	`165`	`+ _frameRingBuffer.UpdateResources(outputResources);`
	`166`	`+ }`
`165`	`167`	`}`
`166`	`168`
`167`	`169`	`// 等待新帧`
`@@ -218,11 +220,9 @@ void FrameProducer::_ProducerThreadProc(`
`218`	`220`	`if (_Initialize(colorInfo, hMonSrc, srcRect, rendererSize, outputSize)) {`
`219`	`221`	`// 同步 outputSize`
`220`	`222`	`task.SetResult(true, std::memory_order_release);`
`221`		`- _state.store(ComponentState::NoError, std::memory_order_release);`
`222`	`223`	`} else {`
`223`	`224`	`Logger::Get().Error("_Initialize 失败");`
`224`	`225`	`task.SetResult(false);`
`225`		`- _state.store(ComponentState::Error, std::memory_order_relaxed);`
`226`	`226`	`return;`
`227`	`227`	`}`
`228`	`228`