e39daf4146
This reverts commit e1223747c27e22c4c4c3006af10d58aec9718b28. Reason for revert: Breaks WebRTC roll into Chromium. E.g: https://ci.chromium.org/ui/p/chromium/builders/try/cast_shell_linux/1166014/overview Original change's description: > wayland: Add a common interface for screencast and remote desktop portal > > Change adapts the `base_capturer_pipewire` so that a portal can be > injected in the capturer. This allows the remoting to inject its > own portal for the purpose of capturing desktop stream as long > as the injected portal provides implementation of the new interface > that is added as part of this change. > > Additionally, a method has been exposed on the capturer to get > details about the portal session so that the remoting > implementation can use the same underlying session for controlling > inputs on the remote host. > > Finally, desktop capturer interface is extended with a generic > method `GetMetadata` that is used to retrieve session related > information by CRD and relay it over to its input injector. Clients > provide override for the method and it eventually invokes the > underlying `GetSessionDetails` method on the portal instance. > > Bug: chromium:1291247 > Change-Id: I81b7ce3b949d8be2e24e2d303d5fbc76a849209c > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256400 > Reviewed-by: Alexander Cooper <alcooper@chromium.org> > Commit-Queue: Salman Malik <salmanmalik@google.com> > Cr-Commit-Position: refs/heads/main@{#36323} Bug: chromium:1291247 Change-Id: I73fbb1b9a103d61fd8d7f04bb8452b3e29da9025 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256801 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Henrik Boström <hbos@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/main@{#36331}
69 lines
2.6 KiB
C++
69 lines
2.6 KiB
C++
/*
|
|
* Copyright (c) 2016 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_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_
|
|
#define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "modules/desktop_capture/desktop_capture_types.h"
|
|
#include "modules/desktop_capture/desktop_capturer.h"
|
|
#include "modules/desktop_capture/desktop_frame.h"
|
|
#include "modules/desktop_capture/desktop_geometry.h"
|
|
#include "modules/desktop_capture/shared_desktop_frame.h"
|
|
#include "modules/desktop_capture/shared_memory.h"
|
|
#include "rtc_base/system/rtc_export.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// DesktopCapturer wrapper that calculates updated_region() by comparing frames
|
|
// content. This class always expects the underlying DesktopCapturer
|
|
// implementation returns a superset of updated regions in DestkopFrame. If a
|
|
// DesktopCapturer implementation does not know the updated region, it should
|
|
// set updated_region() to full frame.
|
|
//
|
|
// This class marks entire frame as updated if the frame size or frame stride
|
|
// has been changed.
|
|
class RTC_EXPORT DesktopCapturerDifferWrapper
|
|
: public DesktopCapturer,
|
|
public DesktopCapturer::Callback {
|
|
public:
|
|
// Creates a DesktopCapturerDifferWrapper with a DesktopCapturer
|
|
// implementation, and takes its ownership.
|
|
explicit DesktopCapturerDifferWrapper(
|
|
std::unique_ptr<DesktopCapturer> base_capturer);
|
|
|
|
~DesktopCapturerDifferWrapper() override;
|
|
|
|
// DesktopCapturer interface.
|
|
void Start(DesktopCapturer::Callback* callback) override;
|
|
void SetSharedMemoryFactory(
|
|
std::unique_ptr<SharedMemoryFactory> shared_memory_factory) override;
|
|
void CaptureFrame() override;
|
|
void SetExcludedWindow(WindowId window) override;
|
|
bool GetSourceList(SourceList* screens) override;
|
|
bool SelectSource(SourceId id) override;
|
|
bool FocusOnSelectedSource() override;
|
|
bool IsOccluded(const DesktopVector& pos) override;
|
|
|
|
private:
|
|
// DesktopCapturer::Callback interface.
|
|
void OnCaptureResult(Result result,
|
|
std::unique_ptr<DesktopFrame> frame) override;
|
|
|
|
const std::unique_ptr<DesktopCapturer> base_capturer_;
|
|
DesktopCapturer::Callback* callback_;
|
|
std::unique_ptr<SharedDesktopFrame> last_frame_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_
|