4379a7db1f
This is a reland of 44dd3d743517fe85212ba4f68bda1e78c2e6d7ec Original change's description: > Migrate modules/desktop_capture and modules/video_capture to webrtc::Mutex. > > Bug: webrtc:11567 > Change-Id: I7bfca17f91bf44151148f863480ce77804d53a04 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178805 > Commit-Queue: Markus Handell <handellm@webrtc.org> > Reviewed-by: Tommi <tommi@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31681} Bug: webrtc:11567 Change-Id: I03a32cb7194cffb9e678355c4af4d370b39384b3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179093 Reviewed-by: Tommi <tommi@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31716}
74 lines
2.6 KiB
C++
74 lines
2.6 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/mac/desktop_configuration_monitor.h"
|
|
|
|
#include "modules/desktop_capture/mac/desktop_configuration.h"
|
|
#include "rtc_base/logging.h"
|
|
#include "rtc_base/trace_event.h"
|
|
|
|
namespace webrtc {
|
|
|
|
DesktopConfigurationMonitor::DesktopConfigurationMonitor() {
|
|
CGError err = CGDisplayRegisterReconfigurationCallback(
|
|
DesktopConfigurationMonitor::DisplaysReconfiguredCallback, this);
|
|
if (err != kCGErrorSuccess)
|
|
RTC_LOG(LS_ERROR) << "CGDisplayRegisterReconfigurationCallback " << err;
|
|
MutexLock lock(&desktop_configuration_lock_);
|
|
desktop_configuration_ = MacDesktopConfiguration::GetCurrent(
|
|
MacDesktopConfiguration::TopLeftOrigin);
|
|
}
|
|
|
|
DesktopConfigurationMonitor::~DesktopConfigurationMonitor() {
|
|
CGError err = CGDisplayRemoveReconfigurationCallback(
|
|
DesktopConfigurationMonitor::DisplaysReconfiguredCallback, this);
|
|
if (err != kCGErrorSuccess)
|
|
RTC_LOG(LS_ERROR) << "CGDisplayRemoveReconfigurationCallback " << err;
|
|
}
|
|
|
|
MacDesktopConfiguration DesktopConfigurationMonitor::desktop_configuration() {
|
|
MutexLock lock(&desktop_configuration_lock_);
|
|
return desktop_configuration_;
|
|
}
|
|
|
|
// static
|
|
// This method may be called on any system thread.
|
|
void DesktopConfigurationMonitor::DisplaysReconfiguredCallback(
|
|
CGDirectDisplayID display,
|
|
CGDisplayChangeSummaryFlags flags,
|
|
void* user_parameter) {
|
|
DesktopConfigurationMonitor* monitor =
|
|
reinterpret_cast<DesktopConfigurationMonitor*>(user_parameter);
|
|
monitor->DisplaysReconfigured(display, flags);
|
|
}
|
|
|
|
void DesktopConfigurationMonitor::DisplaysReconfigured(
|
|
CGDirectDisplayID display,
|
|
CGDisplayChangeSummaryFlags flags) {
|
|
TRACE_EVENT0("webrtc", "DesktopConfigurationMonitor::DisplaysReconfigured");
|
|
RTC_LOG(LS_INFO) << "DisplaysReconfigured: "
|
|
"DisplayID "
|
|
<< display << "; ChangeSummaryFlags " << flags;
|
|
|
|
if (flags & kCGDisplayBeginConfigurationFlag) {
|
|
reconfiguring_displays_.insert(display);
|
|
return;
|
|
}
|
|
|
|
reconfiguring_displays_.erase(display);
|
|
if (reconfiguring_displays_.empty()) {
|
|
MutexLock lock(&desktop_configuration_lock_);
|
|
desktop_configuration_ = MacDesktopConfiguration::GetCurrent(
|
|
MacDesktopConfiguration::TopLeftOrigin);
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|