fix: 避免强制帧干扰重复帧检测

Blinue · Dec 31, 2024 · 54e1f36 · 54e1f36
1 parent ae42505
commit 54e1f36
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/src/Magpie.Core/FrameSourceBase.cpp b/src/Magpie.Core/FrameSourceBase.cpp
@@ -110,13 +110,9 @@ bool FrameSourceBase::Initialize(DeviceResources& deviceResources, BackendDescri
 	return true;
 }
 
-FrameSourceState FrameSourceBase::Update(bool forceNewFrame) noexcept {
+FrameSourceState FrameSourceBase::Update() noexcept {
 	const FrameSourceState state = _Update();
 
-	if (forceNewFrame) {
-		return FrameSourceState::NewFrame;
-	}
-
 	const ScalingOptions& options = ScalingWindow::Get().Options();
 	const auto duplicateFrameDetectionMode = options.duplicateFrameDetectionMode;
 	if (state != FrameSourceState::NewFrame || options.Is3DGameMode() ||

diff --git a/src/Magpie.Core/FrameSourceBase.h b/src/Magpie.Core/FrameSourceBase.h
@@ -29,7 +29,7 @@ class FrameSourceBase {
 
 	bool Initialize(DeviceResources& deviceResources, BackendDescriptorStore& descriptorStore) noexcept;
 
-	FrameSourceState Update(bool forceNewFrame) noexcept;
+	FrameSourceState Update() noexcept;
 
 	ID3D11Texture2D* GetOutput() noexcept {
 		return _output.get();
@@ -76,7 +76,7 @@ class FrameSourceBase {
 	DeviceResources* _deviceResources = nullptr;
 	BackendDescriptorStore* _descriptorStore = nullptr;
 	winrt::com_ptr<ID3D11Texture2D> _output;
-	ID3D11ShaderResourceView* _outputSrv;
+	ID3D11ShaderResourceView* _outputSrv = nullptr;
 
 	winrt::com_ptr<ID3D11Buffer> _resultBuffer;
 	ID3D11UnorderedAccessView* _resultBufferUav = nullptr;

diff --git a/src/Magpie.Core/Renderer.cpp b/src/Magpie.Core/Renderer.cpp
@@ -687,12 +687,18 @@ void Renderer::_BackendThreadProc() noexcept {
 			continue;
 		}
 
-		FrameSourceState state = _frameSource->Update(stepTimerStatus == StepTimerStatus::ForceNewFrame);
-
-		if (state == FrameSourceState::NewFrame) {
+		switch (_frameSource->Update()) {
+		case FrameSourceState::Waiting:
+			if (stepTimerStatus != StepTimerStatus::ForceNewFrame) {
+				break;
+			}
+			// 强制帧
+			[[fallthrough]];
+		case FrameSourceState::NewFrame:
 			_stepTimer.PrepareForRender();
 			_BackendRender(outputTexture);
-		} else if (state == FrameSourceState::Error) [[unlikely]] {
+			break;
+		case FrameSourceState::Error:
 			// 捕获出错，退出缩放
 			ScalingWindow::Get().Dispatcher().TryEnqueue([]() {
 				ScalingWindow::Get().RuntimeError(ScalingError::CaptureFailed);

diff --git a/src/Magpie/HomeViewModel.cpp b/src/Magpie/HomeViewModel.cpp
@@ -285,8 +285,11 @@ IVector<IInspectable> HomeViewModel::MinFrameRateOptions() const {
 
 int HomeViewModel::MinFrameRateIndex() const noexcept {
 	float minFrameRate = AppSettings::Get().MinFrameRate();
-	auto it = std::find(
-		MIN_FRAME_RATE_OPTIONS.begin(), MIN_FRAME_RATE_OPTIONS.end(), minFrameRate);
+	auto it = std::find_if(
+		MIN_FRAME_RATE_OPTIONS.begin(),
+		MIN_FRAME_RATE_OPTIONS.end(),
+		[&](int value) { return std::abs(minFrameRate - value) < 1e-5f; }
+	);
 	if (it == MIN_FRAME_RATE_OPTIONS.end()) {
 		return -1;
 	} else {
@@ -299,7 +302,7 @@ void HomeViewModel::MinFrameRateIndex(int value) {
 		return;
 	}
 
-	AppSettings::Get().MinFrameRate(MIN_FRAME_RATE_OPTIONS[value]);
+	AppSettings::Get().MinFrameRate((float)MIN_FRAME_RATE_OPTIONS[value]);
 }
 
 bool HomeViewModel::IsDeveloperMode() const noexcept {