Add multi-monitor and P010 detection

awawa-dev · Oct 29, 2024 · c55be9d · c55be9d
1 parent 1785dd2
commit c55be9d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/include/grabber/windows/DX/DxGrabber.h b/include/grabber/windows/DX/DxGrabber.h
@@ -103,6 +103,8 @@ public slots:
 
 private:
 
+	const QString MULTI_MONITOR = "MULTI-MONITOR";
+
 	void captureFrame(DisplayHandle& display);
 
 	QString GetSharedLut();
@@ -127,6 +129,7 @@ public slots:
 	QTimer*					_retryTimer;
 	int						_warningCounter;
 	bool					_wideGamut;
+	bool					_multiMonitor;
 
 	bool					_dxRestartNow;
 	std::list<std::unique_ptr<DisplayHandle>> _handles;

diff --git a/include/utils/PixelFormat.h b/include/utils/PixelFormat.h
@@ -11,6 +11,7 @@ enum class PixelFormat {
 	I420,
 	NV12,
 	MJPEG,
+	P010,
 	NO_CHANGE
 };
 
@@ -42,6 +43,10 @@ inline PixelFormat parsePixelFormat(const QString& pixelFormat)
 	{
 		return PixelFormat::MJPEG;
 	}
+	else if (format.compare("p010") == 0)
+	{
+		return PixelFormat::P010;
+	}
 
 	return PixelFormat::NO_CHANGE;
 }
@@ -73,6 +78,10 @@ inline QString pixelFormatToString(const PixelFormat& pixelFormat)
 	{
 		return "mjpeg";
 	}
+	else if (pixelFormat == PixelFormat::P010)
+	{
+		return "p010";
+	}
 
 	return "NO_CHANGE";
 }
diff --git a/sources/grabber/linux/v4l2/V4L2Grabber.cpp b/sources/grabber/linux/v4l2/V4L2Grabber.cpp
@@ -69,6 +69,9 @@ static const V4L2Grabber::HyperHdrFormat supportedFormats[] =
 	{ V4L2_PIX_FMT_YUV420, PixelFormat::I420 },
 	{ V4L2_PIX_FMT_NV12,   PixelFormat::NV12 },
 	{ V4L2_PIX_FMT_MJPEG,  PixelFormat::MJPEG }
+	#ifdef V4L2_PIX_FMT_P010
+		,{ V4L2_PIX_FMT_P010,  PixelFormat::P010 }
+	#endif
 };
 
 

diff --git a/sources/grabber/windows/DX/DxGrabber.cpp b/sources/grabber/windows/DX/DxGrabber.cpp
@@ -65,6 +65,7 @@ DxGrabber::DxGrabber(const QString& device, const QString& configurationPath)
 	, _retryTimer(new QTimer(this))
 	, _warningCounter(MAX_WARNINGS)
 	, _wideGamut(false)
+	, _multiMonitor(false)
 
 
 	, _dxRestartNow(false)
@@ -241,7 +242,8 @@ void DxGrabber::enumerateDevices(bool silent)
 		pAdapter->GetDesc1(&pDesc);
 
 		IDXGIOutput* pOutput;
-		for (UINT j = 0; pAdapter->EnumOutputs(j, &pOutput) != DXGI_ERROR_NOT_FOUND; j++)
+		UINT j = 0;
+		for (; pAdapter->EnumOutputs(j, &pOutput) != DXGI_ERROR_NOT_FOUND; j++)
 		{
 			DXGI_OUTPUT_DESC oDesc;
 			pOutput->GetDesc(&oDesc);
@@ -251,6 +253,12 @@ void DxGrabber::enumerateDevices(bool silent)
 
 			SafeRelease(&pOutput);
 		}
+
+		if (j > 1)
+		{
+			_deviceProperties.insert(MULTI_MONITOR + "|" + QString::fromWCharArray(pDesc.Description), properties);
+		}
+
 		SafeRelease(&pAdapter);
 	}
 	SafeRelease(&pFactory);
@@ -303,18 +311,21 @@ bool DxGrabber::initDirectX(QString selectedDeviceName)
 	{
 		DeviceProperties properties;
 		DXGI_ADAPTER_DESC1 pDesc;
+		QString multiName = MULTI_MONITOR + "|" + QString::fromWCharArray(pDesc.Description);
 
 		pAdapter->GetDesc1(&pDesc);
 
+		_multiMonitor = (selectedDeviceName == multiName);
+
 		IDXGIOutput* pOutput;
-		for (UINT j = 0; pAdapter->EnumOutputs(j, &pOutput) != DXGI_ERROR_NOT_FOUND && !exitNow; j++)
+		for (UINT j = 0; pAdapter->EnumOutputs(j, &pOutput) != DXGI_ERROR_NOT_FOUND && (!exitNow || _multiMonitor); j++)
 		{
 			DXGI_OUTPUT_DESC oDesc;
 			pOutput->GetDesc(&oDesc);
 
 			QString currentName = (QString::fromWCharArray(oDesc.DeviceName) + "|" + QString::fromWCharArray(pDesc.Description));
 
-			exitNow = (currentName == selectedDeviceName);
+			exitNow = (currentName == selectedDeviceName) || _multiMonitor;
 
 			if (exitNow)
 			{

diff --git a/sources/grabber/windows/MF/MFGrabber.cpp b/sources/grabber/windows/MF/MFGrabber.cpp
@@ -111,7 +111,7 @@ const static VideoFormat fmt_array[] =
 	{ MFVideoFormat_Y42T,	"Y42T", PixelFormat::NO_CHANGE },
 	{ MFVideoFormat_P210,	"P210", PixelFormat::NO_CHANGE },
 	{ MFVideoFormat_P216,	"P216", PixelFormat::NO_CHANGE },
-	{ MFVideoFormat_P010,	"P010", PixelFormat::NO_CHANGE },
+	{ MFVideoFormat_P010,	"P010", PixelFormat::P010 },
 	{ MFVideoFormat_P016,	"P016", PixelFormat::NO_CHANGE },
 	{ MFVideoFormat_v210,	"v210", PixelFormat::NO_CHANGE },
 	{ MFVideoFormat_v216,	"v216", PixelFormat::NO_CHANGE },