c6416fbe16
While investigating some screen-capture-track-end-in-meeting issues, the relevant rtc error logs are not uploaded to server as other webrtc modules do, which cause great hardness to identify the reason. This cl is to use existing trace event methods to store error logs of desktop capturers. Bug: chromium:831756 Change-Id: Id0c1b439f9b63916fb9417cf4e6f2b8f3c556fcd Reviewed-on: https://webrtc-review.googlesource.com/69783 Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Commit-Queue: Brave Yao <braveyao@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22866}
97 lines
3.4 KiB
C++
97 lines
3.4 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"
|
|
#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) {
|
|
TRACE_EVENT0("webrtc", "DesktopConfigurationMonitor::DisplaysReconfigured");
|
|
RTC_LOG(LS_INFO) << "DisplaysReconfigured: "
|
|
<< "DisplayID " << display << "; ChangeSummaryFlags "
|
|
<< 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
|