fb99c6ebb5
CGDisplayStreamCreate is an deprecated API. It was believed that the use of it was disabled on Sonoma through the setting allow_iosurface = false [1], which causes the thumbnails to be created by the API CGDisplayCreateImage. This API is not marked as deprecated at the moment. However, although the thumbnails are created through CGDisplayCreateImage, CGDisplayStreamCreate() is still called and runs in the background. This makes the capture chip appear. No capture chip appears if this CL is landed and the ScreenCaptureKit thumbnail capturer is enabled, --enable-features="ScreenCaptureKitMac,ScreenCaptureKitStreamPickerSonoma,ThumbnailCapturerMac:capture_mode/sc_screenshot_manager" [1] https://chromium-review.googlesource.com/c/chromium/src/+/4892397 Bug: chromium:1486851 Change-Id: I3422efffc57dcb3e8965f19a5eca7f2a95d62da1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/334721 Reviewed-by: Mark Foltz <mfoltz@chromium.org> Commit-Queue: Johannes Kron <kron@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41563}
62 lines
2.1 KiB
C++
62 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 "api/sequence_checker.h"
|
|
#include "modules/desktop_capture/shared_desktop_frame.h"
|
|
#include "sdk/objc/helpers/scoped_cftyperef.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class DesktopFrameProvider {
|
|
public:
|
|
explicit DesktopFrameProvider(bool allow_iosurface);
|
|
~DesktopFrameProvider();
|
|
|
|
DesktopFrameProvider(const DesktopFrameProvider&) = delete;
|
|
DesktopFrameProvider& operator=(const DesktopFrameProvider&) = delete;
|
|
|
|
// 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();
|
|
|
|
bool allow_iosurface() const { return allow_iosurface_; }
|
|
|
|
private:
|
|
SequenceChecker 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_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_FRAME_PROVIDER_H_
|