Add wrapper for capturing PipeWire streams
This provides a slightly simplified interface around a webrtc::SharedScreenCastStream and allows the virtual monitor's mapping ID to be stored alongside the stream. Bug: 378932951 Change-Id: I58c9c81433ba366a9e4130ad4c21d574c1952a99 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6442792 Reviewed-by: Joe Downing <joedow@chromium.org> Commit-Queue: Erik Jensen <rkjnsn@chromium.org> Cr-Commit-Position: refs/heads/main@{#1445543}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
c7dc0b5325
commit
6c236bba39
remoting/host/linux
@ -167,6 +167,8 @@ source_set("platform_impls") {
|
||||
"keyboard_layout_monitor_linux.cc",
|
||||
"keyboard_layout_monitor_utils.cc",
|
||||
"keyboard_layout_monitor_utils.h",
|
||||
"pipewire_capture_stream.cc",
|
||||
"pipewire_capture_stream.h",
|
||||
]
|
||||
deps = [
|
||||
":x11",
|
||||
|
87
remoting/host/linux/pipewire_capture_stream.cc
Normal file
87
remoting/host/linux/pipewire_capture_stream.cc
Normal file
@ -0,0 +1,87 @@
|
||||
// Copyright 2025 The Chromium Authors
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "remoting/host/linux/pipewire_capture_stream.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <utility>
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/sequence_checker.h"
|
||||
#include "remoting/host/base/screen_resolution.h"
|
||||
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
|
||||
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
|
||||
#include "third_party/webrtc/modules/desktop_capture/mouse_cursor.h"
|
||||
|
||||
namespace remoting {
|
||||
|
||||
PipewireCaptureStream::PipewireCaptureStream() = default;
|
||||
|
||||
PipewireCaptureStream::~PipewireCaptureStream() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
}
|
||||
|
||||
void PipewireCaptureStream::SetPipeWireStream(
|
||||
std::uint32_t pipewire_node,
|
||||
ScreenResolution initial_resolution,
|
||||
std::string mapping_id,
|
||||
int pipewire_fd) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
pipewire_node_ = pipewire_node;
|
||||
resolution_ = initial_resolution;
|
||||
mapping_id_ = std::move(mapping_id);
|
||||
pipewire_fd_ = pipewire_fd;
|
||||
}
|
||||
|
||||
void PipewireCaptureStream::StartVideoCapture(
|
||||
webrtc::DesktopCapturer::Callback* callback) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
stream_->StartScreenCastStream(
|
||||
pipewire_node_, pipewire_fd_, resolution_.dimensions().width(),
|
||||
resolution_.dimensions().height(), false, callback);
|
||||
}
|
||||
|
||||
void PipewireCaptureStream::SetResolution(ScreenResolution new_resolution) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
resolution_ = new_resolution;
|
||||
stream_->UpdateScreenCastStreamResolution(resolution_.dimensions().width(),
|
||||
resolution_.dimensions().height());
|
||||
}
|
||||
|
||||
void PipewireCaptureStream::SetMaxFrameRate(std::uint32_t frame_rate) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
stream_->UpdateScreenCastStreamFrameRate(frame_rate);
|
||||
}
|
||||
|
||||
std::unique_ptr<webrtc::MouseCursor> PipewireCaptureStream::CaptureCursor() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
return stream_->CaptureCursor();
|
||||
}
|
||||
|
||||
std::optional<webrtc::DesktopVector>
|
||||
PipewireCaptureStream::CaptureCursorPosition() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
return stream_->CaptureCursorPosition();
|
||||
}
|
||||
|
||||
void PipewireCaptureStream::StopVideoCapture() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
stream_->StopScreenCastStream();
|
||||
}
|
||||
|
||||
std::string_view PipewireCaptureStream::mapping_id() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
return mapping_id_;
|
||||
}
|
||||
|
||||
base::WeakPtr<PipewireCaptureStream> PipewireCaptureStream::GetWeakPtr() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
return weak_ptr_factory_.GetWeakPtr();
|
||||
}
|
||||
|
||||
} // namespace remoting
|
101
remoting/host/linux/pipewire_capture_stream.h
Normal file
101
remoting/host/linux/pipewire_capture_stream.h
Normal file
@ -0,0 +1,101 @@
|
||||
// Copyright 2025 The Chromium Authors
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef REMOTING_HOST_LINUX_PIPEWIRE_CAPTURE_STREAM_H_
|
||||
#define REMOTING_HOST_LINUX_PIPEWIRE_CAPTURE_STREAM_H_
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/sequence_checker.h"
|
||||
#include "base/thread_annotations.h"
|
||||
#include "remoting/host/base/screen_resolution.h"
|
||||
#include "third_party/webrtc/api/scoped_refptr.h"
|
||||
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
|
||||
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
|
||||
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.h"
|
||||
#include "third_party/webrtc/modules/desktop_capture/mouse_cursor.h"
|
||||
#include "third_party/webrtc/modules/portal/pipewire_utils.h"
|
||||
|
||||
namespace remoting {
|
||||
|
||||
// Wraps a PipeWire capture stream representing a logical monitor, such as may
|
||||
// be provided by the GNOME, Portal, and similar remote desktop APIs.
|
||||
class PipewireCaptureStream {
|
||||
public:
|
||||
PipewireCaptureStream();
|
||||
PipewireCaptureStream(const PipewireCaptureStream&) = delete;
|
||||
PipewireCaptureStream& operator=(const PipewireCaptureStream&) = delete;
|
||||
~PipewireCaptureStream();
|
||||
|
||||
// Specifies the |pipewire_node| from which to capture and the
|
||||
// |initial_resolution| to negotiate. The node should be configured to provide
|
||||
// the mouse cursor as metadata.
|
||||
//
|
||||
// |mapping_id| is an opaque mapping ID that may be provided by the
|
||||
// higher-level remote desktop API to facilitate matching the monitor to its
|
||||
// corresponding input region. It is stored and made accessible via the
|
||||
// mapping_id() method for convenience, but is otherwise unused and may be an
|
||||
// empty string.
|
||||
//
|
||||
// If specified, |pipewire_fd| is used to communicate with the target PipeWire
|
||||
// instance. Otherwise, connects to the default PipeWire instance.
|
||||
void SetPipeWireStream(std::uint32_t pipewire_node,
|
||||
ScreenResolution initial_resolution,
|
||||
std::string mapping_id,
|
||||
int pipewire_fd = webrtc::kInvalidPipeWireFd);
|
||||
|
||||
// Starts capturing the video stream. The methods on |callback| will be
|
||||
// invoked from the PipeWire thread as each new frame is received. (They will
|
||||
// not be invoked on the caller's sequence.)
|
||||
void StartVideoCapture(webrtc::DesktopCapturer::Callback* callback);
|
||||
|
||||
// Negotiates a new video resolution with PipeWire. If capturing from a
|
||||
// virtual monitor, it will be resized to match.
|
||||
void SetResolution(ScreenResolution new_resolution);
|
||||
|
||||
// Sets the maximum rate at which new frames should be delivered.
|
||||
void SetMaxFrameRate(std::uint32_t frame_rate);
|
||||
|
||||
// Gets the most recent mouse cursor shape, if one has been received since the
|
||||
// last call. Otherwise, returns nullptr. (May only return a value once each
|
||||
// time the cursor actually changes.)
|
||||
std::unique_ptr<webrtc::MouseCursor> CaptureCursor();
|
||||
|
||||
// Returns a copy of the most recent mouse cursor location received from
|
||||
// PipeWire, if any.
|
||||
std::optional<webrtc::DesktopVector> CaptureCursorPosition();
|
||||
|
||||
// Disconnects from the pipewire stream. No more frame callbacks will be
|
||||
// invoked after this method returns.
|
||||
void StopVideoCapture();
|
||||
|
||||
// Retrieves the mapping ID previously stored by set_mapping_id().
|
||||
std::string_view mapping_id();
|
||||
|
||||
// Obtains a weak pointer to this.
|
||||
base::WeakPtr<PipewireCaptureStream> GetWeakPtr();
|
||||
|
||||
private:
|
||||
int pipewire_fd_ GUARDED_BY_CONTEXT(sequence_checker_);
|
||||
std::uint32_t pipewire_node_ GUARDED_BY_CONTEXT(sequence_checker_);
|
||||
|
||||
ScreenResolution resolution_ GUARDED_BY_CONTEXT(sequence_checker_);
|
||||
std::string mapping_id_ GUARDED_BY_CONTEXT(sequence_checker_);
|
||||
webrtc::scoped_refptr<webrtc::SharedScreenCastStream> stream_
|
||||
GUARDED_BY_CONTEXT(sequence_checker_) =
|
||||
webrtc::SharedScreenCastStream::CreateDefault();
|
||||
|
||||
SEQUENCE_CHECKER(sequence_checker_);
|
||||
|
||||
base::WeakPtrFactory<PipewireCaptureStream> weak_ptr_factory_{this};
|
||||
};
|
||||
|
||||
} // namespace remoting
|
||||
|
||||
#endif // REMOTING_HOST_LINUX_PIPEWIRE_CAPTURE_STREAM_H_
|
Reference in New Issue
Block a user