mozilla: comparison mozilla-pipewire-0-3.patch

equal deleted inserted replaced

-:909f866430ee
+:1d5f5674df6c
+# HG changeset patch
+# Parent  5bd7b491505076dc38ba1efc7c406b9c53ba8389
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 2081d0c683a4..641133bf1ea4 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -314,6 +314,7 @@ system_headers = [
+@@ -309,16 +309,17 @@ system_headers = [
+'gdk/gdkkeysyms.h',
+'gdk/gdkprivate.h',
+'gdk/gdkwayland.h',
+'gdk/gdkx.h',
+'gdk-pixbuf/gdk-pixbuf.h',
 'Gestalt.h',
 'getopt.h',
 'gio/gio.h',
 +    'gio/gunixfdlist.h',
 'glibconfig.h',
 'glib.h',
 'glib-object.h',
-@@ -607,6 +608,7 @@ system_headers = [
+'glob.h',
+'gmodule.h',
+'gnome.h',
+'gnu/libc-version.h',
+'gps.h',
+@@ -602,16 +603,17 @@ system_headers = [
+'pango/pangoxft.h',
+'pascal.h',
+'Patches.h',
+'Path.h',
+'pcfs/pc_dir.h',
 'Pgenerr.h',
 'PGenErr.h',
 'Ph.h',
 +    'pipewire/pipewire.h',
 'pixman.h',
 'pk11func.h',
 'pk11pqg.h',
+'pk11priv.h',
+'pk11pub.h',
+'pk11sdr.h',
+'pkcs11f.h',
+'pkcs11.h',
 diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
-index ba885217b3ba..201d3b755221 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
-@@ -158,7 +158,7 @@ if (rtc_include_tests) {
+@@ -153,17 +153,17 @@ if (rtc_include_tests) {
+"../../test:test_support",
+]
+}
+}
 if (is_linux) {
 if (rtc_use_pipewire) {
 pkg_config("pipewire") {
 -      packages = [ "libpipewire-0.2" ]
 +      packages = [ "libpipewire-0.3" ]
 defines = [ "WEBRTC_USE_PIPEWIRE" ]
 }
+pkg_config("gio") {
+packages = [
+"gio-2.0",
+"gio-unix-2.0",
 diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-index 90b40431c7e4..d844aa79d591 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-@@ -194,6 +194,30 @@ if CONFIG["OS_TARGET"] == "Linux":
+@@ -112,16 +112,39 @@ if CONFIG["OS_TARGET"] == "DragonFly":
+"/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_atom_cache.cc",
+"/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_error_trap.cc",
+"/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
+"/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
+"/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc",
 "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
 ]
 +# PipeWire specific files
 +if CONFIG["OS_TARGET"] == "Linux":
 +        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
 +        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
 +        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
 +    ]
 +
-+
+if CONFIG["OS_TARGET"] == "FreeBSD":
-if CONFIG["OS_TARGET"] == "NetBSD":
 DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_POSIX"] = True
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+OS_LIBS += [
 diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
-index 1eb8ead26efa..316468eed1fc 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
-@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
+@@ -136,15 +136,15 @@ class DesktopCaptureOptions {
+#if defined(USE_X11)
+bool use_update_notifications_ = false;
+#else
+bool use_update_notifications_ = true;
+#endif
 bool disable_effects_ = true;
 bool detect_updated_region_ = false;
 #if defined(WEBRTC_USE_PIPEWIRE)
 -  bool allow_pipewire_ = false;
 +  bool allow_pipewire_ = true;
 #endif
 };
+}  // namespace webrtc
+#endif  // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_
 diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-index 379341c833de..76349f1fbd4d 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-@@ -15,8 +15,11 @@
+@@ -10,18 +10,21 @@
+#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/ioctl.h>
 +#include <sys/syscall.h>
 #include <memory>
 #include <utility>
-@@ -36,31 +39,36 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
+#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"
+@@ -31,181 +34,158 @@ namespace webrtc {
+const char kDesktopBusName[] = "org.freedesktop.portal.Desktop";
+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
++
+// 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);
++void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
++  struct dma_buf_sync sync = { 0 };
++
++  sync.flags = start_or_end | DMA_BUF_SYNC_READ;
 -  switch (state) {
 -    case PW_REMOTE_STATE_ERROR:
 -      RTC_LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
--      break;
--    case PW_REMOTE_STATE_CONNECTED:
--      RTC_LOG(LS_INFO) << "PipeWire remote state: connected.";
--      that->CreateReceivingStream();
--      break;
--    case PW_REMOTE_STATE_CONNECTING:
--      RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
-+// static
-+void BaseCapturerPipeWire::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.";
-+    } else {
+-      break;
-break;
 +    }
 }
 }
-+// static
+// static
 +void BaseCapturerPipeWire::OnCoreError(void *data,
 +                                       uint32_t id,
 +                                       int seq,
 +                                       int res,
 +                                       const char *message) {
 +  RTC_LOG(LS_ERROR) << "core error: " << message;
 +}
 +
-// static
++// static
 void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
 pw_stream_state old_state,
-@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
+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_UNCONNECTED:
++    case PW_STREAM_STATE_PAUSED:
--    case PW_STREAM_STATE_CONNECTING:
++    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_PAUSED:
-case PW_STREAM_STATE_STREAMING:
+-    case PW_STREAM_STATE_STREAMING:
-+    case PW_STREAM_STATE_UNCONNECTED:
-+    case PW_STREAM_STATE_CONNECTING:
 break;
 }
 }
 // static
 +              SPA_PARAM_META_size, SPA_POD_Int (sizeof(struct spa_meta_region))));
 +  pw_stream_update_params(that->pw_stream_, params, 3);
 }
 // static
-@@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProcess(void* data) {
+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 (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
 +    if (next_buffer)
 +      pw_stream_queue_buffer (that->pw_stream_, buffer);
 +  }
 +
 +  if (!buffer) {
 -  pw_stream_queue_buffer(that->pw_stream_, buf);
 +  pw_stream_queue_buffer(that->pw_stream_, buffer);
 }
 BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
-@@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {
+: 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 (start_request_signal_id_) {
 g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
 }
-@@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal() {
+if (sources_request_signal_id_) {
+g_dbus_connection_signal_unsubscribe(connection_,
+sources_request_signal_id_);
+}
+if (session_request_signal_id_) {
+@@ -245,142 +225,220 @@ 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_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);
 +  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;
 +    return;
 +  }
 if (pw_thread_loop_start(pw_main_loop_) < 0) {
 RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
-@@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire() {
+portal_init_failed_ = true;
 }
 }
 -void BaseCapturerPipeWire::InitPipeWireTypes() {
 -  spa_type_map* map = pw_core_type_->map;
 -  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{INT32_MAX, INT32_MAX};
 -void BaseCapturerPipeWire::CreateReceivingStream() {
-+pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
+-  spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
-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())};
-+  spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX};
++  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};
-+  auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
+-
 -  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.";
 -      // 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);
-+  const spa_pod* params[2];
-+  spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
-+
 +  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,
 +
 +    if (map == MAP_FAILED) {
 +      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
 +      return;
 +    }
-+
+-  if (!(src = spaBuffer->datas[0].data)) {
 +    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
 +  } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
 +    int fd;
 +    fd = spaBuffer->datas[0].fd;
++
--  if (!(src = spaBuffer->datas[0].data)) {
 +    map = static_cast<uint8_t*>(mmap(
 +        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
 +        PROT_READ, MAP_PRIVATE, fd, 0));
 +
 +    if (map == MAP_FAILED) {
 +  const 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
-@@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
+<< " != " << (desktop_size_.width() * kBytesPerPixel);
+portal_init_failed_ = true;
 return;
 }
 -  if (!current_frame_) {
 -    current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
+-  }
+-  RTC_DCHECK(current_frame_ != nullptr);
 +  dst = current_frame_.get();
-+
+-  // 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 crop video position
 +  if (video_crop_size_initialized_ &&
 +      (video_crop->region.position.y + video_crop_size_.height() <= desktop_size_.height())) {
 +    for (int i = 0; i < video_crop->region.position.y; ++i) {
 +      src += srcStride;
 +        spa_video_format_.format == SPA_VIDEO_FORMAT_RGBA) {
 +      ConvertRGBxToBGRx(dst, dstStride);
 +    }
 +    src += srcStride - xOffset;
 +    dst += dstStride;
-}
++  }
--  RTC_DCHECK(current_frame_ != nullptr);
++
--  // 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);
 +  if (map) {
 +    if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
 +      SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_END);
 +    }
 +    munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);
 }
 }
-@@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartRequestResponseSignal(
+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];
+@@ -720,20 +778,17 @@ void BaseCapturerPipeWire::OnStartReques
+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->pw_stream_node_id_ = stream_id;
 g_variant_unref(options);
 g_variant_unref(variant);
 }
-@@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame() {
+}
+g_variant_iter_free(iter);
+g_variant_unref(response_data);
+that->OpenPipeWireRemote();
+@@ -808,20 +863,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_;
 +      current_frame_.get(), (frame_size.width() * kBytesPerPixel),
 +      DesktopRect::MakeWH(frame_size.width(), frame_size.height()));
 if (!result) {
 callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
 return;
-@@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) {
+}
+callback_->OnCaptureResult(Result::SUCCESS, std::move(result));
+}
+bool BaseCapturerPipeWire::GetSourceList(SourceList* sources) {
+@@ -832,9 +892,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>
 +  return std::move(capturer);
 +}
 +
 }  // namespace webrtc
 diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-index 56b101acbaa6..de54157d1a2a 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-@@ -22,17 +22,13 @@
+@@ -17,99 +17,103 @@
+#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:
 +    kAny = 0b11
 +  };
 explicit BaseCapturerPipeWire(CaptureSourceType source_type);
 ~BaseCapturerPipeWire() override;
-@@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public DesktopCapturer {
+// 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);
 -      BaseCapturerPipeWire::CaptureSourceType::Screen;
 +      BaseCapturerPipeWire::CaptureSourceType::kAny;
 // <-- end of PipeWire types
-@@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public DesktopCapturer {
+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_crop_size_initialized_ = false;
 +  DesktopSize video_crop_size_;;
 -
 -  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/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-index 26956fc67dc8..3813d697bb38 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-@@ -15,7 +15,7 @@
+@@ -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/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-index 35436475cb4d..c43a1f1a0c4e 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-@@ -15,7 +15,7 @@
+@@ -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/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-index cf8a9dd0e0db..d27fab8d28d9 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
+@@ -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/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
-index 82359e50c2db..bb9724cf7cc2 100644
 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
-@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
+@@ -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;

changeset 1146	1d5f5674df6c
parent 1144	8a43aff7e982
child 1151	8df86bf11fc1