Skip to content

change DX11 Grabber automatic display select behaviour #1323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change DX11 Grabber automatic display select behaviour #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/base/Grabber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ public slots:
QStringList framerates = QStringList();
DeviceControlCapability brightness, contrast, saturation, hue;
QList<DevicePropertiesItem> valid = QList<DevicePropertiesItem>();
bool isPrimary = false;
};

QMap<QString, DeviceProperties> _deviceProperties;
Expand Down
18 changes: 13 additions & 5 deletions sources/grabber/windows/DX/DxGrabber.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ bool DxGrabber::init()
{
QString foundDevice = "";
bool autoDiscovery = (QString::compare(_deviceName, Grabber::AUTO_SETTING, Qt::CaseInsensitive) == 0);

enumerateDevices(true);


Expand All @@ -181,7 +181,15 @@ bool DxGrabber::init()
if (autoDiscovery)
{
Debug(_log, "Forcing auto discovery device");
if (!_deviceProperties.isEmpty())
for (auto [key, properties] : _deviceProperties.asKeyValueRange())
{
if (properties.isPrimary)
{
foundDevice = key;
}
}

if (foundDevice.isNull()) //fallback in case none is primary.. unsure if that can happen
{
foundDevice = _deviceProperties.firstKey();
Debug(_log, "Auto discovery set to %s", QSTRING_CSTR(foundDevice));
Expand Down Expand Up @@ -234,7 +242,7 @@ void DxGrabber::enumerateDevices(bool /*silent*/)
{
DeviceProperties properties;
DXGI_ADAPTER_DESC1 pDesc;

MONITORINFOEX mi{}; mi.cbSize = sizeof(mi);
pAdapter->GetDesc1(&pDesc);

IDXGIOutput* pOutput;
Expand All @@ -243,15 +251,15 @@ void DxGrabber::enumerateDevices(bool /*silent*/)
{
DXGI_OUTPUT_DESC oDesc;
pOutput->GetDesc(&oDesc);

properties.isPrimary = (GetMonitorInfo(oDesc.Monitor, &mi) && (mi.dwFlags & MONITORINFOF_PRIMARY));
QString dev = QString::fromWCharArray(oDesc.DeviceName) + "|" + QString::fromWCharArray(pDesc.Description);
_deviceProperties.insert(dev, properties);

SafeRelease(&pOutput);
}

if (j > 1)
{
properties = DeviceProperties();
_deviceProperties.insert(MULTI_MONITOR + "|" + QString::fromWCharArray(pDesc.Description), properties);
}

Expand Down