675513b96a
This CL has been generated with the following script: for m in PLOG \ LOG_TAG \ LOG_GLEM \ LOG_GLE_EX \ LOG_GLE \ LAST_SYSTEM_ERROR \ LOG_ERRNO_EX \ LOG_ERRNO \ LOG_ERR_EX \ LOG_ERR \ LOG_V \ LOG_F \ LOG_T_F \ LOG_E \ LOG_T \ LOG_CHECK_LEVEL_V \ LOG_CHECK_LEVEL \ LOG do git grep -l $m | xargs sed -i "s,\b$m\b,RTC_$m,g" done git checkout rtc_base/logging.h git cl format Bug: webrtc:8452 Change-Id: I1a53ef3e0a5ef6e244e62b2e012b864914784600 Reviewed-on: https://webrtc-review.googlesource.com/21325 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20617}
91 lines
3.2 KiB
C++
91 lines
3.2 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 "system_wrappers/include/event_wrapper.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// The amount of time allowed for displays to reconfigure.
|
|
static const int64_t kDisplayConfigurationEventTimeoutMs = 10 * 1000;
|
|
|
|
DesktopConfigurationMonitor::DesktopConfigurationMonitor()
|
|
: display_configuration_capture_event_(EventWrapper::Create()) {
|
|
CGError err = CGDisplayRegisterReconfigurationCallback(
|
|
DesktopConfigurationMonitor::DisplaysReconfiguredCallback, this);
|
|
if (err != kCGErrorSuccess) {
|
|
RTC_LOG(LS_ERROR) << "CGDisplayRegisterReconfigurationCallback " << err;
|
|
abort();
|
|
}
|
|
display_configuration_capture_event_->Set();
|
|
|
|
desktop_configuration_ = MacDesktopConfiguration::GetCurrent(
|
|
MacDesktopConfiguration::TopLeftOrigin);
|
|
}
|
|
|
|
DesktopConfigurationMonitor::~DesktopConfigurationMonitor() {
|
|
CGError err = CGDisplayRemoveReconfigurationCallback(
|
|
DesktopConfigurationMonitor::DisplaysReconfiguredCallback, this);
|
|
if (err != kCGErrorSuccess)
|
|
RTC_LOG(LS_ERROR) << "CGDisplayRemoveReconfigurationCallback " << err;
|
|
}
|
|
|
|
void DesktopConfigurationMonitor::Lock() {
|
|
if (!display_configuration_capture_event_->Wait(
|
|
kDisplayConfigurationEventTimeoutMs)) {
|
|
RTC_LOG_F(LS_ERROR) << "Event wait timed out.";
|
|
abort();
|
|
}
|
|
}
|
|
|
|
void DesktopConfigurationMonitor::Unlock() {
|
|
display_configuration_capture_event_->Set();
|
|
}
|
|
|
|
// static
|
|
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) {
|
|
if (flags & kCGDisplayBeginConfigurationFlag) {
|
|
if (reconfiguring_displays_.empty()) {
|
|
// If this is the first display to start reconfiguring then wait on
|
|
// |display_configuration_capture_event_| to block the capture thread
|
|
// from accessing display memory until the reconfiguration completes.
|
|
if (!display_configuration_capture_event_->Wait(
|
|
kDisplayConfigurationEventTimeoutMs)) {
|
|
RTC_LOG_F(LS_ERROR) << "Event wait timed out.";
|
|
abort();
|
|
}
|
|
}
|
|
reconfiguring_displays_.insert(display);
|
|
} else {
|
|
reconfiguring_displays_.erase(display);
|
|
if (reconfiguring_displays_.empty()) {
|
|
desktop_configuration_ = MacDesktopConfiguration::GetCurrent(
|
|
MacDesktopConfiguration::TopLeftOrigin);
|
|
display_configuration_capture_event_->Set();
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|