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 = [

     'Gestalt.h',

     'getopt.h',

     'gio/gio.h',

+    'gio/gunixfdlist.h',

     'glibconfig.h',

     'glib.h',

     'glib-object.h',

@@ -607,6 +608,7 @@ system_headers = [

     'Pgenerr.h',

     'PGenErr.h',

     'Ph.h',

+    'pipewire/pipewire.h',

     'pixman.h',

     'pk11func.h',

     'pk11pqg.h',

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..03581f7c38b5 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,28 @@ if CONFIG["OS_TARGET"] == "Linux":

         "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"

     ]

+# PipeWire specific files

+if CONFIG["OS_TARGET"] == "Linux":

+

+    DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"

+

+    OS_LIBS += [

+        "rt",

+        "pipewire-0.2",

+        "glib-2.0",

+        "gio-2.0",

+        "gobject-2.0"

+    ]

+

+    CXXFLAGS += CONFIG['TK_CFLAGS']

+

+    UNIFIED_SOURCES += [

+        "/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"] == "NetBSD":

     DEFINES["USE_X11"] = "1"

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 {

   bool disable_effects_ = true;

   bool detect_updated_region_ = false;

 #if defined(WEBRTC_USE_PIPEWIRE)

-  bool allow_pipewire_ = false;

+  bool allow_pipewire_ = true;

 #endif

 };

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..a51f7851b20f 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

@@ -18,6 +18,11 @@

 #include <spa/param/video/raw-utils.h>

 #include <spa/support/type-map.h>

+#include <linux/dma-buf.h>

+#include <sys/mman.h>

+#include <sys/ioctl.h>

+#include <sys/syscall.h>

+

 #include <memory>

 #include <utility>

@@ -36,6 +41,26 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";

 const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";

 const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";

+

+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;

+    } else {

+      break;

+    }

+  }

+}

+

 // static

 void BaseCapturerPipeWire::OnStateChanged(void* data,

                                           pw_remote_state old_state,

@@ -112,7 +137,7 @@ void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,

   auto builder = spa_pod_builder{buffer, sizeof(buffer)};

   // Setup buffers and meta header for new format.

-  const struct spa_pod* params[2];

+  const struct spa_pod* params[3];

   params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(

       &builder,

       // id to enumerate buffer requirements

@@ -141,8 +166,14 @@ void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,

       // 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);

+  params[2] = reinterpret_cast<spa_pod*>(

+      spa_pod_builder_object(&builder, that->pw_core_type_->param.idMeta,

+                             that->pw_core_type_->param_meta.Meta, ":",

+                             that->pw_core_type_->param_meta.type, "I",

+                             that->pw_core_type_->meta.VideoCrop, ":",

+                             that->pw_core_type_->param_meta.size, "i",

+                             sizeof(struct spa_meta_video_crop)));

+  pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/3);

 }

 // static

@@ -150,15 +181,25 @@ 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;

+

+  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) {

     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)

@@ -197,10 +238,6 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {

     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_);

   }

@@ -332,8 +369,7 @@ void BaseCapturerPipeWire::CreateReceivingStream() {

   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);

+      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE);

   if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,

                         flags, params,

                         /*n_params=*/1) != 0) {

@@ -344,15 +380,75 @@ void BaseCapturerPipeWire::CreateReceivingStream() {

 }

 void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {

+  struct spa_meta_video_crop* video_crop;

   spa_buffer* spaBuffer = buffer->buffer;

-  void* src = nullptr;

+  uint8_t *map = nullptr;

+  uint8_t* src = nullptr;

+  uint8_t* dst = nullptr;

+

+  if (spaBuffer->datas[0].chunk->size == 0) {

+    map = nullptr;

+    src = nullptr;

+  } else if (spaBuffer->datas[0].type == pw_core_type_->data.MemFd) {

+    map = mmap(nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,

+               PROT_READ, MAP_PRIVATE, spaBuffer->datas[0].fd, 0);

+    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);

+  } else if (spaBuffer->datas[0].type == pw_core_type_->data.DmaBuf) {

+    int fd;

+    fd = spaBuffer->datas[0].fd;

+

+    map = mmap (nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,

+                PROT_READ, MAP_PRIVATE, fd, 0);

+    SyncDmaBuf(fd, DMA_BUF_SYNC_START);

+

+    src = SPA_MEMBER (map, spaBuffer->datas[0].mapoffset, uint8_t);

+  } else if (spaBuffer->datas[0].type == pw_core_type_->data.MemPtr) {

+    map = nullptr;

+    src = spaBuffer->datas[0].data;

+  } else {

+    return;

+  }

-  if (!(src = spaBuffer->datas[0].data)) {

+  if (!src) {

     return;

   }

-  uint32_t maxSize = spaBuffer->datas[0].maxsize;

-  int32_t srcStride = spaBuffer->datas[0].chunk->stride;

+  DesktopSize prev_crop_size = video_crop_size_.value_or(DesktopSize(0, 0));

+

+  if ((video_crop = static_cast<struct spa_meta_video_crop*>(

+           spa_buffer_find_meta(spaBuffer, pw_core_type_->meta.VideoCrop)))) {

+    RTC_DCHECK(video_crop->width <= desktop_size_.width() &&

+               video_crop->height <= desktop_size_.height());

+    if ((video_crop->width != desktop_size_.width() ||

+        video_crop->height != desktop_size_.height()) && video_crop->width && video_crop->height) {

+      video_crop_size_ = DesktopSize(video_crop->width, video_crop->height);

+    } else {

+      video_crop_size_.reset();

+    }

+  } else {

+    video_crop_size_.reset();

+  }

+

+  size_t frame_size;

+  if (video_crop_size_) {

+    frame_size =

+        video_crop_size_->width() * video_crop_size_->height() * kBytesPerPixel;

+  } else {

+    frame_size =

+        desktop_size_.width() * desktop_size_.height() * kBytesPerPixel;

+  }

+

+  if (!current_frame_ ||

+      (video_crop_size_ && !video_crop_size_->equals(prev_crop_size))) {

+    current_frame_ = std::make_unique<uint8_t[]>(frame_size);

+  }

+  RTC_DCHECK(current_frame_ != nullptr);

+

+  const int32_t dstStride = video_crop_size_

+                                ? video_crop_size_->width() * kBytesPerPixel

+                                : desktop_size_.width() * kBytesPerPixel;

+  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 +457,39 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {

     return;

   }

-  if (!current_frame_) {

-    current_frame_ = static_cast<uint8_t*>(malloc(maxSize));

+  dst = current_frame_.get();

+

+  // Adjust source content based on crop video position

+  if (video_crop_size_ &&

+      (video_crop->y + video_crop_size_->height() <= desktop_size_.height())) {

+    for (int i = 0; i < video_crop->y; ++i) {

+      src += srcStride;

+    }

+  }

+  const int xOffset =

+      video_crop_size_ && (video_crop->x + video_crop_size_->width() <=

+                           desktop_size_.width())

+          ? video_crop->x * kBytesPerPixel

+          : 0;

+  const int height = video_crop_size_ ? video_crop_size_->height() : desktop_size_.height();

+  for (int i = 0; i < 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 == pw_type_->video_format.RGBx) {

+      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 == pw_core_type_->data.DmaBuf) {

+      SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_END);

+    }

+    munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);

   }

 }

@@ -813,10 +927,12 @@ void BaseCapturerPipeWire::CaptureFrame() {

     return;

   }

-  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));

+  DesktopSize frame_size = video_crop_size_.value_or(desktop_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;

@@ -837,4 +953,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) {

   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/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..56af57891379 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

@@ -32,7 +32,11 @@ class PipeWireType {

 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;

@@ -43,6 +47,12 @@ class BaseCapturerPipeWire : public DesktopCapturer {

   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_core* pw_core_ = nullptr;

@@ -64,7 +74,7 @@ class BaseCapturerPipeWire : public DesktopCapturer {

   gint32 pw_fd_ = -1;

   CaptureSourceType capture_source_type_ =

-      BaseCapturerPipeWire::CaptureSourceType::Screen;

+      BaseCapturerPipeWire::CaptureSourceType::kAny;

   // <-- end of PipeWire types

@@ -78,10 +88,11 @@ class BaseCapturerPipeWire : public DesktopCapturer {

   guint sources_request_signal_id_ = 0;

   guint start_request_signal_id_ = 0;

+  std::optional<DesktopSize> video_crop_size_ = std::nullopt;

   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;

@@ -95,6 +106,7 @@ class BaseCapturerPipeWire : public DesktopCapturer {

   void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);

+  static void SyncDmaBuf(int fd, uint64_t start_or_end);

   static void OnStateChanged(void* data,

                              pw_remote_state old_state,

                              pw_remote_state state,

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 @@

 namespace webrtc {

 ScreenCapturerPipeWire::ScreenCapturerPipeWire()

-    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}

+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kScreen) {}

 ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}

 // static

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 @@

 namespace webrtc {

 WindowCapturerPipeWire::WindowCapturerPipeWire()

-    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}

+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kWindow) {}

 WindowCapturerPipeWire::~WindowCapturerPipeWire() {}

 // static

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(

     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)

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(

     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)