zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multi-monitor support in the screen capturer for Mac.

Browse Source 
This feature was broken in r5471.

BUG=361919
R=jiayl@webrtc.org

Committed: https://code.google.com/p/webrtc/source/detail?r=5937

Review URL: https://webrtc-codereview.appspot.com/12109004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5942 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sergeyu@chromium.org
2014-04-19 00:25:35 +00:00
parent 8e5ec52e76
commit 3d9ec1fed4
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/desktop_capture/mac/desktop_configuration.h
View File

@ -59,10 +59,11 @@ struct MacDesktopConfiguration {
const MacDisplayConfiguration* FindDisplayConfigurationById(
CGDirectDisplayID id);
// Bounds of the desktop in Density-Independent Pixels (DIPs).
// Bounds of the desktop excluding monitors with DPI settings different from
// the main monitor. In Density-Independent Pixels (DIPs).
DesktopRect bounds;
// Bounds of the desktop in physical pixels.
// Same as bounds, but expressed in physical pixels.
DesktopRect pixel_bounds;
// Scale factor from DIPs to physical pixels.

6
webrtc/modules/desktop_capture/mac/desktop_configuration.mm
View File

@ -134,12 +134,16 @@ MacDesktopConfiguration MacDesktopConfiguration::GetCurrent(Origin origin) {
// Add the display to the configuration.
desktop_config.displays.push_back(display_config);
// Update the desktop bounds to account for this display.
// Update the desktop bounds to account for this display, unless the current
// display uses different DPI settings.
if (display_config.dip_to_pixel_scale ==
desktop_config.dip_to_pixel_scale) {
desktop_config.bounds =
JoinRects(desktop_config.bounds, display_config.bounds);
desktop_config.pixel_bounds =
JoinRects(desktop_config.pixel_bounds, display_config.pixel_bounds);
}
}
return desktop_config;
}