mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: desktopCapturer and screen source ids should match screen ids (#42860)

Browse source 
* fix: desktopCapturer screen source ids should match screen ids

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* test: add a regression test

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2024-07-11 14:54:22 +02:00 • committed by GitHub
parent 6631dd16ec
commit b1bf730793
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 48 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
shell/browser/api/electron_api_desktop_capturer.cc
View file

@ -167,6 +167,16 @@ std::unique_ptr<ThumbnailCapturer> MakeScreenCapturer() {
: nullptr;
}
#if BUILDFLAG(IS_WIN)
BOOL CALLBACK EnumDisplayMonitorsCallback(HMONITOR monitor,
HDC hdc,
LPRECT rect,
LPARAM data) {
reinterpret_cast<std::vector<HMONITOR>*>(data)->push_back(monitor);
return TRUE;
}
#endif
} // namespace
namespace gin {
@ -396,11 +406,22 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
return;
}
int device_name_index = 0;
for (auto& source : screen_sources) {
const auto& device_name = device_names[device_name_index++];
const int64_t device_id = base::PersistentHash(device_name);
source.display_id = base::NumberToString(device_id);
std::vector<HMONITOR> monitors;
EnumDisplayMonitors(nullptr, nullptr, EnumDisplayMonitorsCallback,
reinterpret_cast<LPARAM>(&monitors));
std::vector<std::pair<std::string, MONITORINFOEX>> pairs;
for (const auto& device_name : device_names) {
std::wstring wide_device_name;
base::UTF8ToWide(device_name.c_str(), device_name.size(),
&wide_device_name);
for (const auto monitor : monitors) {
MONITORINFOEX monitorInfo{{sizeof(MONITORINFOEX)}};
if (GetMonitorInfo(monitor, &monitorInfo)) {
if (wide_device_name == monitorInfo.szDevice)
pairs.push_back(std::make_pair(device_name, monitorInfo));
}
}
}
}
#elif BUILDFLAG(IS_MAC)