summaryrefslogtreecommitdiff
path: root/pw2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pw2.patch')
-rw-r--r--pw2.patch901
1 files changed, 0 insertions, 901 deletions
diff --git a/pw2.patch b/pw2.patch
deleted file mode 100644
index 9390460..0000000
--- a/pw2.patch
+++ /dev/null
@@ -1,901 +0,0 @@
-
-# HG changeset patch
-# User stransky <stransky@redhat.com>
-# Date 1604560111 0
-# Node ID 998e6d0b24e4a560e5664aaef87307e9c069ad87
-# Parent 1c126b520042591194e88618ae11a6adc1da9a08
-Bug 1672947 Update PipeWire WebRTC code to PipeWire 0.3, r=ng
-
-Differential Revision: https://phabricator.services.mozilla.com/D94589
-
-diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
---- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-+++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-@@ -10,18 +10,20 @@
-
- #include "modules/desktop_capture/linux/base_capturer_pipewire.h"
-
- #include <gio/gunixfdlist.h>
- #include <glib-object.h>
-
- #include <spa/param/format-utils.h>
- #include <spa/param/props.h>
--#include <spa/param/video/raw-utils.h>
--#include <spa/support/type-map.h>
-+
-+#include <sys/mman.h>
-+#include <sys/ioctl.h>
-+#include <sys/syscall.h>
-
- #include <memory>
- #include <utility>
-
- #include "modules/desktop_capture/desktop_capture_options.h"
- #include "modules/desktop_capture/desktop_capturer.h"
- #include "rtc_base/checks.h"
- #include "rtc_base/logging.h"
-@@ -32,180 +34,166 @@ const char kDesktopBusName[] = "org.free
- const char kDesktopObjectPath[] = "/org/freedesktop/portal/desktop";
- const char kDesktopRequestObjectPath[] =
- "/org/freedesktop/portal/desktop/request";
- const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
- const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
- const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
-
- // static
--void BaseCapturerPipeWire::OnStateChanged(void* data,
-- pw_remote_state old_state,
-- pw_remote_state state,
-- const char* error_message) {
-- BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-- RTC_DCHECK(that);
-+struct dma_buf_sync {
-+ uint64_t flags;
-+};
-+#define DMA_BUF_SYNC_READ (1 << 0)
-+#define DMA_BUF_SYNC_START (0 << 2)
-+#define DMA_BUF_SYNC_END (1 << 2)
-+#define DMA_BUF_BASE 'b'
-+#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
-
-- switch (state) {
-- case PW_REMOTE_STATE_ERROR:
-- RTC_LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
-+static void SyncDmaBuf(int fd, uint64_t start_or_end) {
-+ struct dma_buf_sync sync = { 0 };
-+
-+ sync.flags = start_or_end | DMA_BUF_SYNC_READ;
-+
-+ while(true) {
-+ int ret;
-+ ret = ioctl (fd, DMA_BUF_IOCTL_SYNC, &sync);
-+ if (ret == -1 && errno == EINTR) {
-+ continue;
-+ } else if (ret == -1) {
-+ RTC_LOG(LS_ERROR) << "Failed to synchronize DMA buffer: " << g_strerror(errno);
- break;
-- case PW_REMOTE_STATE_CONNECTED:
-- RTC_LOG(LS_INFO) << "PipeWire remote state: connected.";
-- that->CreateReceivingStream();
-+ } else {
- break;
-- case PW_REMOTE_STATE_CONNECTING:
-- RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
-- break;
-- case PW_REMOTE_STATE_UNCONNECTED:
-- RTC_LOG(LS_INFO) << "PipeWire remote state: unconnected.";
-- break;
-+ }
- }
- }
-
- // static
-+void BaseCapturerPipeWire::OnCoreError(void *data,
-+ uint32_t id,
-+ int seq,
-+ int res,
-+ const char *message) {
-+ RTC_LOG(LS_ERROR) << "core error: " << message;
-+}
-+
-+// static
- void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
- pw_stream_state old_state,
- pw_stream_state state,
- const char* error_message) {
- BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
- RTC_DCHECK(that);
-
- switch (state) {
- case PW_STREAM_STATE_ERROR:
- RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
- break;
-- case PW_STREAM_STATE_CONFIGURE:
-- pw_stream_set_active(that->pw_stream_, true);
-- break;
-+ case PW_STREAM_STATE_PAUSED:
-+ case PW_STREAM_STATE_STREAMING:
- case PW_STREAM_STATE_UNCONNECTED:
- case PW_STREAM_STATE_CONNECTING:
-- case PW_STREAM_STATE_READY:
-- case PW_STREAM_STATE_PAUSED:
-- case PW_STREAM_STATE_STREAMING:
- break;
- }
- }
-
- // static
--void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,
-- const struct spa_pod* format) {
-+void BaseCapturerPipeWire::OnStreamParamChanged(void *data, uint32_t id,
-+ const struct spa_pod *format) {
- BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
- RTC_DCHECK(that);
-
-- RTC_LOG(LS_INFO) << "PipeWire stream format changed.";
-+ RTC_LOG(LS_INFO) << "PipeWire stream param changed.";
-
-- if (!format) {
-- pw_stream_finish_format(that->pw_stream_, /*res=*/0, /*params=*/nullptr,
-- /*n_params=*/0);
-+ if (!format || id != SPA_PARAM_Format) {
- return;
- }
-
-- that->spa_video_format_ = new spa_video_info_raw();
-- spa_format_video_raw_parse(format, that->spa_video_format_,
-- &that->pw_type_->format_video);
-+ spa_format_video_raw_parse(format, &that->spa_video_format_);
-
-- auto width = that->spa_video_format_->size.width;
-- auto height = that->spa_video_format_->size.height;
-+ auto width = that->spa_video_format_.size.width;
-+ auto height = that->spa_video_format_.size.height;
- auto stride = SPA_ROUND_UP_N(width * kBytesPerPixel, 4);
- auto size = height * stride;
-
-+ that->desktop_size_ = DesktopSize(width, height);
-+
- uint8_t buffer[1024] = {};
- auto builder = spa_pod_builder{buffer, sizeof(buffer)};
-
- // Setup buffers and meta header for new format.
-- const struct spa_pod* params[2];
-- params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
-- &builder,
-- // id to enumerate buffer requirements
-- that->pw_core_type_->param.idBuffers,
-- that->pw_core_type_->param_buffers.Buffers,
-- // Size: specified as integer (i) and set to specified size
-- ":", that->pw_core_type_->param_buffers.size, "i", size,
-- // Stride: specified as integer (i) and set to specified stride
-- ":", that->pw_core_type_->param_buffers.stride, "i", stride,
-- // Buffers: specifies how many buffers we want to deal with, set as
-- // integer (i) where preferred number is 8, then allowed number is defined
-- // as range (r) from min and max values and it is undecided (u) to allow
-- // negotiation
-- ":", that->pw_core_type_->param_buffers.buffers, "iru", 8,
-- SPA_POD_PROP_MIN_MAX(1, 32),
-- // Align: memory alignment of the buffer, set as integer (i) to specified
-- // value
-- ":", that->pw_core_type_->param_buffers.align, "i", 16));
-- params[1] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
-- &builder,
-- // id to enumerate supported metadata
-- that->pw_core_type_->param.idMeta, that->pw_core_type_->param_meta.Meta,
-- // Type: specified as id or enum (I)
-- ":", that->pw_core_type_->param_meta.type, "I",
-- that->pw_core_type_->meta.Header,
-- // Size: size of the metadata, specified as integer (i)
-- ":", that->pw_core_type_->param_meta.size, "i",
-- sizeof(struct spa_meta_header)));
--
-- pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/2);
-+ const struct spa_pod* params[3];
-+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
-+ SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
-+ SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
-+ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32)));
-+ params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
-+ SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
-+ SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))));
-+ params[2] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
-+ SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop),
-+ SPA_PARAM_META_size, SPA_POD_Int (sizeof(struct spa_meta_region))));
-+ pw_stream_update_params(that->pw_stream_, params, 3);
- }
-
- // static
- void BaseCapturerPipeWire::OnStreamProcess(void* data) {
- BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
- RTC_DCHECK(that);
-
-- pw_buffer* buf = nullptr;
-+ struct pw_buffer *next_buffer;
-+ struct pw_buffer *buffer = nullptr;
-
-- if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
-+ next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
-+ while (next_buffer) {
-+ buffer = next_buffer;
-+ next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
-+
-+ if (next_buffer) {
-+ pw_stream_queue_buffer (that->pw_stream_, buffer);
-+ }
-+ }
-+
-+ if (!buffer) {
- return;
- }
-
-- that->HandleBuffer(buf);
-+ that->HandleBuffer(buffer);
-
-- pw_stream_queue_buffer(that->pw_stream_, buf);
-+ pw_stream_queue_buffer(that->pw_stream_, buffer);
- }
-
- BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
- : capture_source_type_(source_type) {}
-
- BaseCapturerPipeWire::~BaseCapturerPipeWire() {
- if (pw_main_loop_) {
- pw_thread_loop_stop(pw_main_loop_);
- }
-
-- if (pw_type_) {
-- delete pw_type_;
-- }
--
-- if (spa_video_format_) {
-- delete spa_video_format_;
-- }
--
- if (pw_stream_) {
- pw_stream_destroy(pw_stream_);
- }
-
-- if (pw_remote_) {
-- pw_remote_destroy(pw_remote_);
-+ if (pw_core_) {
-+ pw_core_disconnect(pw_core_);
- }
-
-- if (pw_core_) {
-- pw_core_destroy(pw_core_);
-+ if (pw_context_) {
-+ pw_context_destroy(pw_context_);
- }
-
- if (pw_main_loop_) {
- pw_thread_loop_destroy(pw_main_loop_);
- }
-
-- if (pw_loop_) {
-- pw_loop_destroy(pw_loop_);
-- }
--
-- if (current_frame_) {
-- free(current_frame_);
-- }
--
- if (start_request_signal_id_) {
- g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
- }
- if (sources_request_signal_id_) {
- g_dbus_connection_signal_unsubscribe(connection_,
- sources_request_signal_id_);
- }
- if (session_request_signal_id_) {
-@@ -245,143 +233,210 @@ void BaseCapturerPipeWire::InitPortal()
- kDesktopBusName, kDesktopObjectPath, kScreenCastInterfaceName,
- /*cancellable=*/nullptr,
- reinterpret_cast<GAsyncReadyCallback>(OnProxyRequested), this);
- }
-
- void BaseCapturerPipeWire::InitPipeWire() {
- pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
-
-- pw_loop_ = pw_loop_new(/*properties=*/nullptr);
-- pw_main_loop_ = pw_thread_loop_new(pw_loop_, "pipewire-main-loop");
-+ pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
-+ pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
-+ if (!pw_context_) {
-+ RTC_LOG(LS_ERROR) << "Failed to create PipeWire context";
-+ return;
-+ }
-
-- pw_core_ = pw_core_new(pw_loop_, /*properties=*/nullptr);
-- pw_core_type_ = pw_core_get_type(pw_core_);
-- pw_remote_ = pw_remote_new(pw_core_, nullptr, /*user_data_size=*/0);
--
-- InitPipeWireTypes();
-+ pw_core_ = pw_context_connect(pw_context_, nullptr, 0);
-+ if (!pw_core_) {
-+ RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context";
-+ return;
-+ }
-
- // Initialize event handlers, remote end and stream-related.
-- pw_remote_events_.version = PW_VERSION_REMOTE_EVENTS;
-- pw_remote_events_.state_changed = &OnStateChanged;
-+ pw_core_events_.version = PW_VERSION_CORE_EVENTS;
-+ pw_core_events_.error = &OnCoreError;
-
- pw_stream_events_.version = PW_VERSION_STREAM_EVENTS;
- pw_stream_events_.state_changed = &OnStreamStateChanged;
-- pw_stream_events_.format_changed = &OnStreamFormatChanged;
-+ pw_stream_events_.param_changed = &OnStreamParamChanged;
- pw_stream_events_.process = &OnStreamProcess;
-
-- pw_remote_add_listener(pw_remote_, &spa_remote_listener_, &pw_remote_events_,
-- this);
-- pw_remote_connect_fd(pw_remote_, pw_fd_);
-+ pw_core_add_listener(pw_core_, &spa_core_listener_, &pw_core_events_, this);
-+
-+ pw_stream_ = CreateReceivingStream();
-+ if (!pw_stream_) {
-+ RTC_LOG(LS_ERROR) << "Failed to create PipeWire stream";
-+ return;
-+ }
-
- if (pw_thread_loop_start(pw_main_loop_) < 0) {
- RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
- portal_init_failed_ = true;
- }
- }
-
--void BaseCapturerPipeWire::InitPipeWireTypes() {
-- spa_type_map* map = pw_core_type_->map;
-- pw_type_ = new PipeWireType();
--
-- spa_type_media_type_map(map, &pw_type_->media_type);
-- spa_type_media_subtype_map(map, &pw_type_->media_subtype);
-- spa_type_format_video_map(map, &pw_type_->format_video);
-- spa_type_video_format_map(map, &pw_type_->video_format);
--}
-+pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
-+ spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
-+ spa_rectangle pwMaxScreenBounds = spa_rectangle{UINT32_MAX, UINT32_MAX};
-
--void BaseCapturerPipeWire::CreateReceivingStream() {
-- spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
-- spa_rectangle pwScreenBounds =
-- spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
-- static_cast<uint32_t>(desktop_size_.height())};
-+ auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
-
-- spa_fraction pwFrameRateMin = spa_fraction{0, 1};
-- spa_fraction pwFrameRateMax = spa_fraction{60, 1};
--
-- pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
-- /*end of varargs*/ nullptr);
-- pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
-+ if (!stream) {
-+ RTC_LOG(LS_ERROR) << "Could not create receiving stream.";
-+ return nullptr;
-+ }
-
- uint8_t buffer[1024] = {};
-- const spa_pod* params[1];
-- spa_pod_builder builder = spa_pod_builder{buffer, sizeof(buffer)};
-- params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
-- &builder,
-- // id to enumerate formats
-- pw_core_type_->param.idEnumFormat, pw_core_type_->spa_format, "I",
-- pw_type_->media_type.video, "I", pw_type_->media_subtype.raw,
-- // Video format: specified as id or enum (I), preferred format is BGRx,
-- // then allowed formats are enumerated (e) and the format is undecided (u)
-- // to allow negotiation
-- ":", pw_type_->format_video.format, "Ieu", pw_type_->video_format.BGRx,
-- SPA_POD_PROP_ENUM(2, pw_type_->video_format.RGBx,
-- pw_type_->video_format.BGRx),
-- // Video size: specified as rectangle (R), preferred size is specified as
-- // first parameter, then allowed size is defined as range (r) from min and
-- // max values and the format is undecided (u) to allow negotiation
-- ":", pw_type_->format_video.size, "Rru", &pwScreenBounds, 2,
-- &pwMinScreenBounds, &pwScreenBounds,
-- // Frame rate: specified as fraction (F) and set to minimum frame rate
-- // value
-- ":", pw_type_->format_video.framerate, "F", &pwFrameRateMin,
-- // Max frame rate: specified as fraction (F), preferred frame rate is set
-- // to maximum value, then allowed frame rate is defined as range (r) from
-- // min and max values and it is undecided (u) to allow negotiation
-- ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
-- &pwFrameRateMin, &pwFrameRateMax));
-+ const spa_pod* params[2];
-+ spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
-
-- pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
-- this);
-- pw_stream_flags flags = static_cast<pw_stream_flags>(
-- PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
-- PW_STREAM_FLAG_MAP_BUFFERS);
-- if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,
-- flags, params,
-- /*n_params=*/1) != 0) {
-+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-+ SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
-+ SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
-+ SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(5, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_RGBA,
-+ SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_BGRA),
-+ SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMinScreenBounds,
-+ &pwMinScreenBounds,
-+ &pwMaxScreenBounds),
-+ 0));
-+ pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this);
-+
-+ if (pw_stream_connect(stream, PW_DIRECTION_INPUT, pw_stream_node_id_,
-+ PW_STREAM_FLAG_AUTOCONNECT, params, 1) != 0) {
- RTC_LOG(LS_ERROR) << "Could not connect receiving stream.";
- portal_init_failed_ = true;
-- return;
-+ }
-+
-+ return stream;
-+}
-+
-+static void SpaBufferUnmap(unsigned char *map, int map_size, bool IsDMABuf, int fd) {
-+ if (map) {
-+ if (IsDMABuf) {
-+ SyncDmaBuf(fd, DMA_BUF_SYNC_END);
-+ }
-+ munmap(map, map_size);
- }
- }
-
- void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
- spa_buffer* spaBuffer = buffer->buffer;
-- void* src = nullptr;
-+ uint8_t *map = nullptr;
-+ uint8_t* src = nullptr;
-
-- if (!(src = spaBuffer->datas[0].data)) {
-+ if (spaBuffer->datas[0].chunk->size == 0) {
-+ RTC_LOG(LS_ERROR) << "Failed to get video stream: Zero size.";
- return;
- }
-
-- uint32_t maxSize = spaBuffer->datas[0].maxsize;
-- int32_t srcStride = spaBuffer->datas[0].chunk->stride;
-- if (srcStride != (desktop_size_.width() * kBytesPerPixel)) {
-- RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
-- << srcStride
-- << " != " << (desktop_size_.width() * kBytesPerPixel);
-- portal_init_failed_ = true;
-+ switch (spaBuffer->datas[0].type) {
-+ case SPA_DATA_MemFd:
-+ case SPA_DATA_DmaBuf:
-+ map = static_cast<uint8_t*>(mmap(
-+ nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
-+ PROT_READ, MAP_PRIVATE, spaBuffer->datas[0].fd, 0));
-+ if (map == MAP_FAILED) {
-+ RTC_LOG(LS_ERROR) << "Failed to mmap memory: " << std::strerror(errno);
-+ return;
-+ }
-+ if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
-+ SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_START);
-+ }
-+ src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
-+ break;
-+ case SPA_DATA_MemPtr:
-+ map = nullptr;
-+ src = static_cast<uint8_t*>(spaBuffer->datas[0].data);
-+ break;
-+ default:
-+ return;
-+ }
-+
-+ if (!src) {
-+ RTC_LOG(LS_ERROR) << "Failed to get video stream: Wrong data after mmap()";
-+ SpaBufferUnmap(map,
-+ spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
-+ spaBuffer->datas[0].type == SPA_DATA_DmaBuf, spaBuffer->datas[0].fd);
-+ return;
-+ }
-+
-+ struct spa_meta_region* video_metadata =
-+ static_cast<struct spa_meta_region*>(
-+ spa_buffer_find_meta_data(spaBuffer, SPA_META_VideoCrop, sizeof(*video_metadata)));
-+
-+ // Video size from metada is bigger than an actual video stream size.
-+ // The metadata are wrong or we should up-scale te video...in both cases
-+ // just quit now.
-+ if (video_metadata &&
-+ (video_metadata->region.size.width > (uint32_t)desktop_size_.width() ||
-+ video_metadata->region.size.height > (uint32_t)desktop_size_.height())) {
-+ RTC_LOG(LS_ERROR) << "Stream metadata sizes are wrong!";
-+ SpaBufferUnmap(map,
-+ spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
-+ spaBuffer->datas[0].type == SPA_DATA_DmaBuf, spaBuffer->datas[0].fd);
- return;
- }
-
-- if (!current_frame_) {
-- current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
-+ // Use video metada when video size from metadata is set and smaller than
-+ // video stream size, so we need to adjust it.
-+ video_metadata_use_ = (video_metadata &&
-+ video_metadata->region.size.width != 0 &&
-+ video_metadata->region.size.height != 0 &&
-+ (video_metadata->region.size.width < (uint32_t)desktop_size_.width() ||
-+ video_metadata->region.size.height < (uint32_t)desktop_size_.height()));
-+
-+ DesktopSize video_size_prev = video_size_;
-+ if (video_metadata_use_) {
-+ video_size_ = DesktopSize(video_metadata->region.size.width,
-+ video_metadata->region.size.height);
-+ } else {
-+ video_size_ = desktop_size_;
- }
-- RTC_DCHECK(current_frame_ != nullptr);
-+
-+ if (!current_frame_ ||
-+ (video_metadata_use_ && !video_size_.equals(video_size_prev))) {
-+ current_frame_ =
-+ std::make_unique<uint8_t[]>
-+ (video_size_.width() * video_size_.height() * kBytesPerPixel);
-+ }
-+
-+ const int32_t dstStride = video_size_.width() * kBytesPerPixel;
-+ const int32_t srcStride = spaBuffer->datas[0].chunk->stride;
-
-- // If both sides decided to go with the RGBx format we need to convert it to
-- // BGRx to match color format expected by WebRTC.
-- if (spa_video_format_->format == pw_type_->video_format.RGBx) {
-- uint8_t* tempFrame = static_cast<uint8_t*>(malloc(maxSize));
-- std::memcpy(tempFrame, src, maxSize);
-- ConvertRGBxToBGRx(tempFrame, maxSize);
-- std::memcpy(current_frame_, tempFrame, maxSize);
-- free(tempFrame);
-- } else {
-- std::memcpy(current_frame_, src, maxSize);
-+ // Adjust source content based on metadata video position
-+ if (video_metadata_use_ &&
-+ (video_metadata->region.position.y + video_size_.height() <= desktop_size_.height())) {
-+ src += srcStride * video_metadata->region.position.y;
- }
-+ const int xOffset =
-+ video_metadata_use_ &&
-+ (video_metadata->region.position.x + video_size_.width() <= desktop_size_.width())
-+ ? video_metadata->region.position.x * kBytesPerPixel
-+ : 0;
-+
-+ uint8_t* dst = current_frame_.get();
-+ for (int i = 0; i < video_size_.height(); ++i) {
-+ // Adjust source content based on crop video position if needed
-+ src += xOffset;
-+ std::memcpy(dst, src, dstStride);
-+ // If both sides decided to go with the RGBx format we need to convert it to
-+ // BGRx to match color format expected by WebRTC.
-+ if (spa_video_format_.format == SPA_VIDEO_FORMAT_RGBx ||
-+ spa_video_format_.format == SPA_VIDEO_FORMAT_RGBA) {
-+ ConvertRGBxToBGRx(dst, dstStride);
-+ }
-+ src += srcStride - xOffset;
-+ dst += dstStride;
-+ }
-+
-+ SpaBufferUnmap(map,
-+ spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
-+ spaBuffer->datas[0].type == SPA_DATA_DmaBuf, spaBuffer->datas[0].fd);
- }
-
- void BaseCapturerPipeWire::ConvertRGBxToBGRx(uint8_t* frame, uint32_t size) {
- // Change color format for KDE KWin which uses RGBx and not BGRx
- for (uint32_t i = 0; i < size; i += 4) {
- uint8_t tempR = frame[i];
- uint8_t tempB = frame[i + 2];
- frame[i] = tempB;
-@@ -713,27 +768,22 @@ void BaseCapturerPipeWire::OnStartReques
- // Array of PipeWire streams. See
- // https://github.com/flatpak/xdg-desktop-portal/blob/master/data/org.freedesktop.portal.ScreenCast.xml
- // documentation for <method name="Start">.
- if (g_variant_lookup(response_data, "streams", "a(ua{sv})", &iter)) {
- GVariant* variant;
-
- while (g_variant_iter_next(iter, "@(ua{sv})", &variant)) {
- guint32 stream_id;
-- gint32 width;
-- gint32 height;
- GVariant* options;
-
- g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
- RTC_DCHECK(options != nullptr);
-
-- g_variant_lookup(options, "size", "(ii)", &width, &height);
--
-- that->desktop_size_.set(width, height);
--
-+ that->pw_stream_node_id_ = stream_id;
- g_variant_unref(options);
- g_variant_unref(variant);
- }
- }
- g_variant_iter_free(iter);
- g_variant_unref(response_data);
-
- that->OpenPipeWireRemote();
-@@ -808,20 +858,25 @@ void BaseCapturerPipeWire::CaptureFrame(
- return;
- }
-
- if (!current_frame_) {
- callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
- return;
- }
-
-- std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));
-+ DesktopSize frame_size = desktop_size_;
-+ if (video_metadata_use_) {
-+ frame_size = video_size_;
-+ }
-+
-+ std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(frame_size));
- result->CopyPixelsFrom(
-- current_frame_, (desktop_size_.width() * kBytesPerPixel),
-- DesktopRect::MakeWH(desktop_size_.width(), desktop_size_.height()));
-+ current_frame_.get(), (frame_size.width() * kBytesPerPixel),
-+ DesktopRect::MakeWH(frame_size.width(), frame_size.height()));
- if (!result) {
- callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
- return;
- }
- callback_->OnCaptureResult(Result::SUCCESS, std::move(result));
- }
-
- bool BaseCapturerPipeWire::GetSourceList(SourceList* sources) {
-@@ -832,9 +887,27 @@ bool BaseCapturerPipeWire::GetSourceList
- return true;
- }
-
- bool BaseCapturerPipeWire::SelectSource(SourceId id) {
- // Screen selection is handled by the xdg-desktop-portal.
- return true;
- }
-
-+// static
-+std::unique_ptr<DesktopCapturer>
-+BaseCapturerPipeWire::CreateRawScreenCapturer(
-+ const DesktopCaptureOptions& options) {
-+ std::unique_ptr<BaseCapturerPipeWire> capturer =
-+ std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
-+ return std::move(capturer);}
-+
-+// static
-+std::unique_ptr<DesktopCapturer>
-+BaseCapturerPipeWire::CreateRawWindowCapturer(
-+ const DesktopCaptureOptions& options) {
-+
-+ std::unique_ptr<BaseCapturerPipeWire> capturer =
-+ std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
-+ return std::move(capturer);
-+}
-+
- } // namespace webrtc
-diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
---- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-+++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-@@ -17,99 +17,102 @@
- #include <spa/param/video/format-utils.h>
-
- #include "modules/desktop_capture/desktop_capture_options.h"
- #include "modules/desktop_capture/desktop_capturer.h"
- #include "rtc_base/constructormagic.h"
-
- namespace webrtc {
-
--class PipeWireType {
-- public:
-- spa_type_media_type media_type;
-- spa_type_media_subtype media_subtype;
-- spa_type_format_video format_video;
-- spa_type_video_format video_format;
--};
--
- class BaseCapturerPipeWire : public DesktopCapturer {
- public:
-- enum CaptureSourceType { Screen = 1, Window };
-+ enum CaptureSourceType : uint32_t {
-+ kScreen = 0b01,
-+ kWindow = 0b10,
-+ kAny = 0b11
-+ };
-
- explicit BaseCapturerPipeWire(CaptureSourceType source_type);
- ~BaseCapturerPipeWire() override;
-
- // DesktopCapturer interface.
- void Start(Callback* delegate) override;
- void CaptureFrame() override;
- bool GetSourceList(SourceList* sources) override;
- bool SelectSource(SourceId id) override;
-
-+ static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(
-+ const DesktopCaptureOptions& options);
-+
-+ static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
-+ const DesktopCaptureOptions& options);
-+
- private:
- // PipeWire types -->
-+ pw_context* pw_context_ = nullptr;
- pw_core* pw_core_ = nullptr;
-- pw_type* pw_core_type_ = nullptr;
- pw_stream* pw_stream_ = nullptr;
-- pw_remote* pw_remote_ = nullptr;
-- pw_loop* pw_loop_ = nullptr;
- pw_thread_loop* pw_main_loop_ = nullptr;
-- PipeWireType* pw_type_ = nullptr;
-
-+ spa_hook spa_core_listener_ = {};
- spa_hook spa_stream_listener_ = {};
-- spa_hook spa_remote_listener_ = {};
-
-+ pw_core_events pw_core_events_ = {};
- pw_stream_events pw_stream_events_ = {};
-- pw_remote_events pw_remote_events_ = {};
-
-- spa_video_info_raw* spa_video_format_ = nullptr;
-+ struct spa_video_info_raw spa_video_format_;
-
-+ guint32 pw_stream_node_id_ = 0;
- gint32 pw_fd_ = -1;
-
- CaptureSourceType capture_source_type_ =
-- BaseCapturerPipeWire::CaptureSourceType::Screen;
-+ BaseCapturerPipeWire::CaptureSourceType::kAny;
-
- // <-- end of PipeWire types
-
- GDBusConnection* connection_ = nullptr;
- GDBusProxy* proxy_ = nullptr;
- gchar* portal_handle_ = nullptr;
- gchar* session_handle_ = nullptr;
- gchar* sources_handle_ = nullptr;
- gchar* start_handle_ = nullptr;
- guint session_request_signal_id_ = 0;
- guint sources_request_signal_id_ = 0;
- guint start_request_signal_id_ = 0;
-
-+ bool video_metadata_use_ = false;
-+ DesktopSize video_size_;
- DesktopSize desktop_size_ = {};
- DesktopCaptureOptions options_ = {};
-
-- uint8_t* current_frame_ = nullptr;
-+ std::unique_ptr<uint8_t[]> current_frame_;
- Callback* callback_ = nullptr;
-
- bool portal_init_failed_ = false;
-
- void InitPortal();
- void InitPipeWire();
-- void InitPipeWireTypes();
-
-- void CreateReceivingStream();
-+ pw_stream* CreateReceivingStream();
- void HandleBuffer(pw_buffer* buffer);
-
- void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);
-
-- static void OnStateChanged(void* data,
-- pw_remote_state old_state,
-- pw_remote_state state,
-- const char* error);
-+ static void OnCoreError(void *data,
-+ uint32_t id,
-+ int seq,
-+ int res,
-+ const char *message);
-+ static void OnStreamParamChanged(void *data,
-+ uint32_t id,
-+ const struct spa_pod *format);
- static void OnStreamStateChanged(void* data,
- pw_stream_state old_state,
- pw_stream_state state,
- const char* error_message);
--
-- static void OnStreamFormatChanged(void* data, const struct spa_pod* format);
- static void OnStreamProcess(void* data);
- static void OnNewBuffer(void* data, uint32_t id);
-
- guint SetupRequestResponseSignal(const gchar* object_path,
- GDBusSignalCallback callback);
-
- static void OnProxyRequested(GObject* object,
- GAsyncResult* result,
-diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
---- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-+++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-@@ -10,17 +10,17 @@
-
- #include "modules/desktop_capture/linux/screen_capturer_pipewire.h"
-
- #include <memory>
-
- namespace webrtc {
-
- ScreenCapturerPipeWire::ScreenCapturerPipeWire()
-- : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}
-+ : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kScreen) {}
- ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
-
- // static
- std::unique_ptr<DesktopCapturer>
- ScreenCapturerPipeWire::CreateRawScreenCapturer(
- const DesktopCaptureOptions& options) {
- return std::make_unique<ScreenCapturerPipeWire>();
- }
-diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
---- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-+++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-@@ -10,17 +10,17 @@
-
- #include "modules/desktop_capture/linux/window_capturer_pipewire.h"
-
- #include <memory>
-
- namespace webrtc {
-
- WindowCapturerPipeWire::WindowCapturerPipeWire()
-- : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}
-+ : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kWindow) {}
- WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
-
- // static
- std::unique_ptr<DesktopCapturer>
- WindowCapturerPipeWire::CreateRawWindowCapturer(
- const DesktopCaptureOptions& options) {
- return std::make_unique<WindowCapturerPipeWire>();
- }
-diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc
---- a/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-+++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-@@ -21,17 +21,17 @@
-
- namespace webrtc {
-
- // static
- std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
- const DesktopCaptureOptions& options) {
- #if defined(WEBRTC_USE_PIPEWIRE)
- if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
-- return ScreenCapturerPipeWire::CreateRawScreenCapturer(options);
-+ return BaseCapturerPipeWire::CreateRawScreenCapturer(options);
- }
- #endif // defined(WEBRTC_USE_PIPEWIRE)
-
- #if defined(USE_X11)
- return ScreenCapturerX11::CreateRawScreenCapturer(options);
- #endif // defined(USE_X11)
-
- return nullptr;
-diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc
---- a/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc
-+++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc
-@@ -21,17 +21,17 @@
-
- namespace webrtc {
-
- // static
- std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
- const DesktopCaptureOptions& options) {
- #if defined(WEBRTC_USE_PIPEWIRE)
- if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
-- return WindowCapturerPipeWire::CreateRawWindowCapturer(options);
-+ return BaseCapturerPipeWire::CreateRawWindowCapturer(options);
- }
- #endif // defined(WEBRTC_USE_PIPEWIRE)
-
- #if defined(USE_X11)
- return WindowCapturerX11::CreateRawWindowCapturer(options);
- #endif // defined(USE_X11)
-
- return nullptr;
-
bgstack15