From: Dan Minor Date: Tue, 31 Jul 2018 13:32:00 -0400 Subject: Bug 1376873 - OS X desktop capture fixes; r=pehrsons Differential Revision: https://phabricator.services.mozilla.com/D7464 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/02c038eca65c1218b56fdf8937fdeab3d8767fe6 --- modules/desktop_capture/mac/screen_capturer_mac.h | 7 +++++++ modules/desktop_capture/mac/screen_capturer_mac.mm | 4 +++- modules/desktop_capture/mouse_cursor_monitor_mac.mm | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/desktop_capture/mac/screen_capturer_mac.h b/modules/desktop_capture/mac/screen_capturer_mac.h index 127cf5ee24..28f0510e3d 100644 --- a/modules/desktop_capture/mac/screen_capturer_mac.h +++ b/modules/desktop_capture/mac/screen_capturer_mac.h @@ -114,6 +114,13 @@ class ScreenCapturerMac final : public DesktopCapturer { // Start, CaptureFrame and destructor have to called in the same thread. SequenceChecker thread_checker_; + + // Used to force CaptureFrame to update it's screen configuration + // and reregister event handlers. This ensure that this + // occurs on the ScreenCapture thread. Read and written from + // both the VideoCapture thread and ScreenCapture thread. + // Protected by desktop_config_monitor_. + bool update_screen_configuration_ = false; }; } // namespace webrtc diff --git a/modules/desktop_capture/mac/screen_capturer_mac.mm b/modules/desktop_capture/mac/screen_capturer_mac.mm index 5f36971ea9..82c07d777a 100644 --- a/modules/desktop_capture/mac/screen_capturer_mac.mm +++ b/modules/desktop_capture/mac/screen_capturer_mac.mm @@ -189,6 +189,7 @@ DesktopRect GetExcludedWindowPixelBounds(CGWindowID window, current_display_); callback_ = callback; + update_screen_configuration_ = false; // Start and operate CGDisplayStream handler all from capture thread. if (!RegisterRefreshAndMoveHandlers()) { RTC_LOG(LS_ERROR) << "Failed to register refresh and move handlers."; @@ -210,7 +211,8 @@ DesktopRect GetExcludedWindowPixelBounds(CGWindowID window, MacDesktopConfiguration new_config = desktop_config_monitor_->desktop_configuration(); - if (!desktop_config_.Equals(new_config)) { + if (update_screen_configuration_ || !desktop_config_.Equals(new_config)) { + update_screen_configuration_ = false; desktop_config_ = new_config; // If the display configuraiton has changed then refresh capturer data // structures. Occasionally, the refresh and move handlers are lost when diff --git a/modules/desktop_capture/mouse_cursor_monitor_mac.mm b/modules/desktop_capture/mouse_cursor_monitor_mac.mm index 248a782762..6ed2c56706 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_mac.mm +++ b/modules/desktop_capture/mouse_cursor_monitor_mac.mm @@ -133,7 +133,8 @@ void DisplaysReconfigured(CGDirectDisplayID display, NSSize nssize = [nsimage size]; // DIP size // No need to caputre cursor image if it's unchanged since last capture. - if ([[nsimage TIFFRepresentation] isEqual:[last_cursor_ TIFFRepresentation]]) + if (last_cursor_ && + [[nsimage TIFFRepresentation] isEqual:[last_cursor_ TIFFRepresentation]]) return; last_cursor_ = nsimage;