bb005b6b96
The issue is visible when reconfiguring the screen arrangement while sharing the displays. Can sometimes be seen right after starting the screen sharing. Indeed CaptureFrame can be called at any time so TakeLatestFrameForDisplay should always return a valid frame and the call should not empty the internal container. Also add missing teardown in the provider on failure case. Bug: webrtc:8652 Change-Id: Ice151c1da92b9ad2b86ca9368d30d9d21114e53e Reviewed-on: https://webrtc-review.googlesource.com/69420 Commit-Queue: Zijie He <zijiehe@chromium.org> Reviewed-by: Zijie He <zijiehe@chromium.org> Cr-Commit-Position: refs/heads/master@{#22846}
61 lines
2.1 KiB
C++
61 lines
2.1 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/synchronization/rw_lock_wrapper.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:
|
|
const bool allow_iosurface_;
|
|
|
|
// A lock protecting |io_surfaces_| across threads.
|
|
const std::unique_ptr<RWLockWrapper> io_surfaces_lock_;
|
|
|
|
// 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_
|