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}
59 lines
2.0 KiB
C++
59 lines
2.0 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_FRAME_PROVIDER_H_
|
|
#define MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_FRAME_PROVIDER_H_
|
|
|
|
#include <CoreGraphics/CoreGraphics.h>
|
|
#include <IOSurface/IOSurface.h>
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
|
|
#include "modules/desktop_capture/shared_desktop_frame.h"
|
|
#include "rtc_base/thread_checker.h"
|
|
#include "sdk/objc/Framework/Classes/Common/scoped_cftyperef.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class DesktopFrameProvider {
|
|
public:
|
|
explicit DesktopFrameProvider(bool allow_iosurface);
|
|
~DesktopFrameProvider();
|
|
|
|
// The caller takes ownership of the returned desktop frame. Otherwise
|
|
// returns null if |display_id| is invalid or not ready. Note that this
|
|
// function does not remove the frame from the internal container. Caller
|
|
// has to call the Release function.
|
|
std::unique_ptr<DesktopFrame> TakeLatestFrameForDisplay(
|
|
CGDirectDisplayID display_id);
|
|
|
|
// OS sends the latest IOSurfaceRef through
|
|
// CGDisplayStreamFrameAvailableHandler callback; we store it here.
|
|
void InvalidateIOSurface(CGDirectDisplayID display_id,
|
|
rtc::ScopedCFTypeRef<IOSurfaceRef> io_surface);
|
|
|
|
// Expected to be called before stopping the CGDisplayStreamRef streams.
|
|
void Release();
|
|
|
|
private:
|
|
rtc::ThreadChecker thread_checker_;
|
|
const bool allow_iosurface_;
|
|
|
|
// Most recent IOSurface that contains a capture of matching display.
|
|
std::map<CGDirectDisplayID, std::unique_ptr<SharedDesktopFrame>> io_surfaces_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrameProvider);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_FRAME_PROVIDER_H_
|