Доработка по переключению в полный экран и обратно - теперь включение/выключение HDR в системе и опции "Allow turn on/off (fullscreen)" работает и без эксклюзивного режима.

Author: Aleksoid1978

Source/DX11VideoProcessor.cpp

@@ -1499,9 +1499,9 @@ bool CDX11VideoProcessor::HandleHDRToggle()
 
 					const bool bNeedToggleOn = !displayConfig.HDREnabled() &&
 											   (m_iHdrToggleDisplay == HDRTD_On || m_iHdrToggleDisplay == HDRTD_OnOff
-											   || m_bExclusiveScreen && (m_iHdrToggleDisplay == HDRTD_On_Fullscreen || m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen));
+											   || m_bExclusiveScreen || m_bFullScreen && (m_iHdrToggleDisplay == HDRTD_On_Fullscreen || m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen));
 					const bool bNeedToggleOff = displayConfig.HDREnabled() &&
-												!bHDREnabled && !m_bExclusiveScreen && m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen;
+												!bHDREnabled && (!m_bExclusiveScreen || !m_bFullScreen) && m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen;
 					DLog(L"HandleHDRToggle() : {}, {}", bNeedToggleOn, bNeedToggleOff);
 					if (bNeedToggleOn) {
 						bRet = ToggleHDR(displayConfig, true);
@@ -4210,3 +4210,13 @@ void CDX11VideoProcessor::UpdateSubPic()
 		}
 	}
 }
+
+void CDX11VideoProcessor::SwitchFullScreen(bool set)
+{
+	m_bFullScreen = set;
+
+	if (HandleHDRToggle()) {
+		InitMediaType(&m_pFilter->m_inputMT);
+		InitSwapChain(false);
+	}
+}

Source/DX11VideoProcessor.h

@@ -152,6 +152,7 @@ class CDX11VideoProcessor
 	CD3D11Polyline  m_SyncLine;
 
 	bool m_bExclusiveScreen = false;
+	bool m_bFullScreen = false;
 
 	int m_iVPSuperRes = SUPERRES_Disable;
 	bool m_bVPUseSuperRes = false; // but it is not exactly
@@ -279,6 +280,8 @@ class CDX11VideoProcessor
 
 	ISubPicAllocator* GetSubPicAllocator() override;
 
+	void SwitchFullScreen(bool set) override;
+
 private:
 	void UpdateTexures();
 	void UpdatePostScaleTexures();

Source/VideoProcessor.h

@@ -228,6 +228,8 @@ class CVideoProcessor
 
 	virtual ISubPicAllocator* GetSubPicAllocator() { return nullptr; }
 
+	virtual void SwitchFullScreen(bool set) {};
+
 protected:
 	inline bool SourceIsPQorHLG() {
 		return m_srcExFmt.VideoTransferFunction == MFVideoTransFunc_2084 || m_srcExFmt.VideoTransferFunction == MFVideoTransFunc_HLG;

Source/VideoRenderer.cpp

@@ -961,21 +961,6 @@ STDMETHODIMP CMpcVideoRenderer::GetPreferredAspectRatio(long *plAspectX, long *p
 	return m_VideoProcessor->GetAspectRatio(plAspectX, plAspectY);
 }
 
-void CMpcVideoRenderer::SwitchFullScreen()
-{
-	DLog(L"CMpcVideoRenderer::SwitchFullScreen() : Switch to fullscreen");
-	m_bExclusiveScreen = true;
-
-	if (m_hWnd) {
-		Init(m_VideoProcessor->Type() == VP_DX9 ? false : true);
-		Redraw();
-
-		if (m_hWndParentMain) {
-			PostMessageW(m_hWndParentMain, WM_SWITCH_FULLSCREEN, 1, 0);
-		}
-	}
-}
-
 static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	CMpcVideoRenderer* pThis = reinterpret_cast <CMpcVideoRenderer*>(GetWindowLongPtrW(hwnd, 0));
@@ -1122,25 +1107,43 @@ STDMETHODIMP CMpcVideoRenderer::SetWindowPosition(long Left, long Top, long Widt
 
 	CAutoLock cRendererLock(&m_RendererLock);
 
-	if (!m_bIsD3DFullscreen && (m_Sets.bExclusiveFS || m_bExclusiveScreen)) {
-		const HMONITOR hMon = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);
+	if (!m_bIsD3DFullscreen) {
+		auto hMon = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);
 		MONITORINFO mi = { mi.cbSize = sizeof(mi) };
 		::GetMonitorInfoW(hMon, &mi);
 		const CRect rcMonitor(mi.rcMonitor);
+		auto fullScreen = (m_windowRect.Width() == rcMonitor.Width() && m_windowRect.Height() == rcMonitor.Height());
+		if (m_Sets.bExclusiveFS || m_bExclusiveScreen) {
+			auto SwitchExclusiveScreen = [this] (bool set) {
+				DLog(L"CMpcVideoRenderer::SetWindowPosition() : Switch {} exclusive screen", set ? L"to" : L"from");
+				m_bExclusiveScreen = set;
+
+				if (m_hWnd) {
+					Init(m_VideoProcessor->Type() == VP_DX9 ? false : true);
+					Redraw();
+
+					if (m_hWndParentMain) {
+						PostMessageW(m_hWndParentMain, WM_SWITCH_FULLSCREEN, static_cast<WPARAM>(set), 0);
+					}
+				}
+			};
 
-		if (!m_bExclusiveScreen && m_windowRect.Width() == rcMonitor.Width() && m_windowRect.Height() == rcMonitor.Height()) {
-			SwitchFullScreen();
-		} else if (m_bExclusiveScreen && (m_windowRect.Width() != rcMonitor.Width() || m_windowRect.Height() != rcMonitor.Height())) {
-			DLog(L"CMpcVideoRenderer::SetWindowPosition() : Switch from fullscreen");
-			m_bExclusiveScreen = false;
+			if (!m_bExclusiveScreen && fullScreen) {
+				SwitchExclusiveScreen(true);
+			} else if (m_bExclusiveScreen && !fullScreen) {
+				SwitchExclusiveScreen(false);
+			}
+		} else {
+			if (!m_bFullScreen && fullScreen) {
+				DLog(L"Switch to FullScreen");
 
-			if (m_hWnd) {
-				Init(m_VideoProcessor->Type() == VP_DX9 ? false : true);
-				Redraw();
+				m_bFullScreen = true;
+				m_VideoProcessor->SwitchFullScreen(true);
+			} else if (m_bFullScreen && !fullScreen) {
+				DLog(L"Switch from FullScreen");
 
-				if (m_hWndParentMain) {
-					PostMessageW(m_hWndParentMain, WM_SWITCH_FULLSCREEN, 0, 0);
-				}
+				m_bFullScreen = false;
+				m_VideoProcessor->SwitchFullScreen(false);
 			}
 		}
 	}

Source/VideoRenderer.h

@@ -321,10 +321,9 @@ class __declspec(uuid("71F080AA-8661-4093-B15E-4F6903E77D0A"))
 
 	LRESULT OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-	void SwitchFullScreen();
-
 	bool m_bExclusiveScreen = false;
 	bool m_bIsD3DFullscreen = false;
+	bool m_bFullScreen      = false;
 
 private:
 	HRESULT Redraw();