aac7deed51
This cl is to move the RegisterRefreshAndMoveHandlers to be done on capture thread, and reverse some execution order of releasing processing, also remove a lock since the handler is on capturing thread too. As we doubt the existing sequence may be the cause of a crash due to race conditions at end of capture. Bug: chromium:851883 Change-Id: I2254a69815144415424a77b4c82f150cfc369585 Reviewed-on: https://webrtc-review.googlesource.com/83822 Commit-Queue: Brave Yao <braveyao@webrtc.org> Reviewed-by: Zijie He <zijiehe@chromium.org> Cr-Commit-Position: refs/heads/master@{#23647}
74 lines
2.0 KiB
Plaintext
74 lines
2.0 KiB
Plaintext
/*
|
|
* Copyright (c) 2018 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_frame_provider.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "modules/desktop_capture/mac/desktop_frame_cgimage.h"
|
|
#include "modules/desktop_capture/mac/desktop_frame_iosurface.h"
|
|
|
|
namespace webrtc {
|
|
|
|
DesktopFrameProvider::DesktopFrameProvider(bool allow_iosurface)
|
|
: allow_iosurface_(allow_iosurface) {
|
|
thread_checker_.DetachFromThread();
|
|
}
|
|
|
|
DesktopFrameProvider::~DesktopFrameProvider() {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
|
Release();
|
|
}
|
|
|
|
std::unique_ptr<DesktopFrame> DesktopFrameProvider::TakeLatestFrameForDisplay(
|
|
CGDirectDisplayID display_id) {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
|
if (!allow_iosurface_) {
|
|
// Regenerate a snapshot.
|
|
return DesktopFrameCGImage::CreateForDisplay(display_id);
|
|
}
|
|
|
|
if (io_surfaces_[display_id]) {
|
|
return io_surfaces_[display_id]->Share();
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
void DesktopFrameProvider::InvalidateIOSurface(CGDirectDisplayID display_id,
|
|
rtc::ScopedCFTypeRef<IOSurfaceRef> io_surface) {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
|
if (!allow_iosurface_) {
|
|
return;
|
|
}
|
|
|
|
std::unique_ptr<DesktopFrameIOSurface> desktop_frame_iosurface =
|
|
DesktopFrameIOSurface::Wrap(io_surface);
|
|
|
|
io_surfaces_[display_id] = desktop_frame_iosurface ?
|
|
SharedDesktopFrame::Wrap(std::move(desktop_frame_iosurface)) :
|
|
nullptr;
|
|
}
|
|
|
|
void DesktopFrameProvider::Release() {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
|
if (!allow_iosurface_) {
|
|
return;
|
|
}
|
|
|
|
io_surfaces_.clear();
|
|
}
|
|
|
|
} // namespace webrtc
|