Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1047743 - Screen sharing with multiple screens is broken (Mac only). r=jesup

Browse Source 
* * *
Bug 1047743 - interdiff to not impact other platforms
This commit is contained in:
Matthew A. Miller 2014-08-27 10:58:14 -06:00
parent 1d0f00a0db
commit 8a67034126
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/webrtc/trunk/webrtc/modules/desktop_capture/mac/desktop_device_info_mac.mm
View File

@ -36,10 +36,12 @@ void DesktopDeviceInfoMac::MultiMonitorScreenshare()
{
DesktopDisplayDevice *pDesktopDeviceInfo = new DesktopDisplayDevice;
if (pDesktopDeviceInfo) {
pDesktopDeviceInfo->setScreenId(0);
pDesktopDeviceInfo->setScreenId(CGMainDisplayID());
pDesktopDeviceInfo->setDeviceName("Primary Monitor");
pDesktopDeviceInfo->setUniqueIdName("\\screen\\monitor#1");
char idStr[64];
snprintf(idStr, sizeof(idStr), "%ld", pDesktopDeviceInfo->getScreenId());
pDesktopDeviceInfo->setUniqueIdName(idStr);
desktop_display_list_[pDesktopDeviceInfo->getScreenId()] = pDesktopDeviceInfo;
}
}

6
media/webrtc/trunk/webrtc/modules/desktop_capture/win/desktop_device_info_win.cc
View File

@ -36,10 +36,12 @@ void DesktopDeviceInfoWin::MultiMonitorScreenshare()
{
DesktopDisplayDevice *pDesktopDeviceInfo = new DesktopDisplayDevice;
if (pDesktopDeviceInfo) {
pDesktopDeviceInfo->setScreenId(0);
pDesktopDeviceInfo->setScreenId(webrtc::kFullDesktopScreenId);
pDesktopDeviceInfo->setDeviceName("Primary Monitor");
pDesktopDeviceInfo->setUniqueIdName("\\screen\\monitor#1");
char idStr[64];
_snprintf_s(idStr, sizeof(idStr), sizeof(idStr) - 1, "%ld", pDesktopDeviceInfo->getScreenId());
pDesktopDeviceInfo->setUniqueIdName(idStr);
desktop_display_list_[pDesktopDeviceInfo->getScreenId()] = pDesktopDeviceInfo;
}
}

6
media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
View File

@ -35,10 +35,12 @@ void DesktopDeviceInfoX11::MultiMonitorScreenshare()
{
DesktopDisplayDevice *pDesktopDeviceInfo = new DesktopDisplayDevice;
if (pDesktopDeviceInfo) {
pDesktopDeviceInfo->setScreenId(0);
pDesktopDeviceInfo->setScreenId(webrtc::kFullDesktopScreenId);
pDesktopDeviceInfo->setDeviceName("Primary Monitor");
pDesktopDeviceInfo->setUniqueIdName("\\screen\\monitor#1");
char idStr[64];
snprintf(idStr, sizeof(idStr), "%ld", idStr);
pDesktopDeviceInfo->setUniqueIdName(idStr);
desktop_display_list_[pDesktopDeviceInfo->getScreenId()] = pDesktopDeviceInfo;
}
}

2
media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc
View File

@ -382,7 +382,7 @@ int32_t DesktopCaptureImpl::Init(const char* uniqueId,
return -1;
}
ScreenId screenid = webrtc::kFullDesktopScreenId;
ScreenId screenid = atoi(uniqueId);
pScreenCapturer->SelectScreen(screenid);
pScreenCapturer->SetMouseShapeObserver(this);