mozilla-pipewire-0-3.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Thu, 23 Jul 2020 16:00:58 +0200
branchfirefox78
changeset 1138 4ac678bd2a26
parent 1134 01a4849e2ed3
child 1140 a9aa543a508a
permissions -rw-r--r--
78.0.2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1134
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
index 2081d0c683a4..641133bf1ea4 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
--- a/config/system-headers.mozbuild
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
+++ b/config/system-headers.mozbuild
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
@@ -314,6 +314,7 @@ system_headers = [
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
     'Gestalt.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
     'getopt.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
     'gio/gio.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
+    'gio/gunixfdlist.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
     'glibconfig.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
     'glib.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
     'glib-object.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
@@ -607,6 +608,7 @@ system_headers = [
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
     'Pgenerr.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
     'PGenErr.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
     'Ph.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
+    'pipewire/pipewire.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
     'pixman.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
     'pk11func.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
     'pk11pqg.h',
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
index ba885217b3ba..201d3b755221 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
@@ -158,7 +158,7 @@ if (rtc_include_tests) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
 if (is_linux) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
   if (rtc_use_pipewire) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
     pkg_config("pipewire") {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
-      packages = [ "libpipewire-0.2" ]
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
+      packages = [ "libpipewire-0.3" ]
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
       defines = [ "WEBRTC_USE_PIPEWIRE" ]
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
     }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
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
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
index 90b40431c7e4..d844aa79d591 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
@@ -194,6 +194,30 @@ if CONFIG["OS_TARGET"] == "Linux":
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
         "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
     ]
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
+# PipeWire specific files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
+if CONFIG["OS_TARGET"] == "Linux":
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
+    DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
+    OS_LIBS += [
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
+        "rt",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
+        "pipewire-0.3",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
+        "glib-2.0",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
+        "gio-2.0",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52
+        "gobject-2.0"
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    53
+    ]
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    54
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    55
+    CXXFLAGS += CONFIG['TK_CFLAGS']
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    56
+    CXXFLAGS += [ "-I/usr/include/pipewire-0.3" ]
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    57
+    CXXFLAGS += [ "-I/usr/include/spa-0.2" ]
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    58
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    59
+    UNIFIED_SOURCES += [
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    60
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    61
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    62
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    63
+    ]
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    64
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    65
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    66
 if CONFIG["OS_TARGET"] == "NetBSD":
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    67
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    68
     DEFINES["USE_X11"] = "1"
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    69
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
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    70
index 1eb8ead26efa..316468eed1fc 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    71
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    72
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    73
@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    74
   bool disable_effects_ = true;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    75
   bool detect_updated_region_ = false;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    76
 #if defined(WEBRTC_USE_PIPEWIRE)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    77
-  bool allow_pipewire_ = false;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    78
+  bool allow_pipewire_ = true;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    79
 #endif
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    80
 };
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    81
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    82
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
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    83
index 379341c833de..76349f1fbd4d 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    84
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    85
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    86
@@ -15,8 +15,11 @@
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    87
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    88
 #include <spa/param/format-utils.h>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    89
 #include <spa/param/props.h>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    90
-#include <spa/param/video/raw-utils.h>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    91
-#include <spa/support/type-map.h>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    92
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    93
+#include <linux/dma-buf.h>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    94
+#include <sys/mman.h>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    95
+#include <sys/ioctl.h>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    96
+#include <sys/syscall.h>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    97
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    98
 #include <memory>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    99
 #include <utility>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   100
@@ -36,31 +39,36 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   101
 const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   102
 const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   103
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   104
-// static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   105
-void BaseCapturerPipeWire::OnStateChanged(void* data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   106
-                                          pw_remote_state old_state,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   107
-                                          pw_remote_state state,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   108
-                                          const char* error_message) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   109
-  BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   110
-  RTC_DCHECK(that);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   111
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   112
-  switch (state) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   113
-    case PW_REMOTE_STATE_ERROR:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   114
-      RTC_LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   115
-      break;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   116
-    case PW_REMOTE_STATE_CONNECTED:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   117
-      RTC_LOG(LS_INFO) << "PipeWire remote state: connected.";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   118
-      that->CreateReceivingStream();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   119
-      break;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   120
-    case PW_REMOTE_STATE_CONNECTING:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   121
-      RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   122
+// static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   123
+void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   124
+  struct dma_buf_sync sync = { 0 };
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   125
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   126
+  sync.flags = start_or_end | DMA_BUF_SYNC_READ;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   127
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   128
+  while(true) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   129
+    int ret;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   130
+    ret = ioctl (fd, DMA_BUF_IOCTL_SYNC, &sync);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   131
+    if (ret == -1 && errno == EINTR) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   132
+      continue;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   133
+    } else if (ret == -1) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   134
+      RTC_LOG(LS_ERROR) << "Failed to synchronize DMA buffer: " << g_strerror(errno);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   135
       break;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   136
-    case PW_REMOTE_STATE_UNCONNECTED:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   137
-      RTC_LOG(LS_INFO) << "PipeWire remote state: unconnected.";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   138
+    } else {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   139
       break;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   140
+    }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   141
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   142
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   143
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   144
+// static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   145
+void BaseCapturerPipeWire::OnCoreError(void *data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   146
+                                       uint32_t id,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   147
+                                       int seq,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   148
+                                       int res,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   149
+                                       const char *message) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   150
+  RTC_LOG(LS_ERROR) << "core error: " << message;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   151
+}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   152
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   153
 // static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   154
 void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   155
                                                 pw_stream_state old_state,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   156
@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   157
     case PW_STREAM_STATE_ERROR:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   158
       RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   159
       break;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   160
-    case PW_STREAM_STATE_CONFIGURE:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   161
-      pw_stream_set_active(that->pw_stream_, true);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   162
-      break;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   163
-    case PW_STREAM_STATE_UNCONNECTED:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   164
-    case PW_STREAM_STATE_CONNECTING:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   165
-    case PW_STREAM_STATE_READY:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   166
     case PW_STREAM_STATE_PAUSED:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   167
     case PW_STREAM_STATE_STREAMING:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   168
+    case PW_STREAM_STATE_UNCONNECTED:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   169
+    case PW_STREAM_STATE_CONNECTING:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   170
       break;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   171
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   172
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   173
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   174
 // static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   175
-void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   176
-                                                 const struct spa_pod* format) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   177
+void BaseCapturerPipeWire::OnStreamParamChanged(void *data, uint32_t id,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   178
+                                                const struct spa_pod *format) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   179
   BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   180
   RTC_DCHECK(that);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   181
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   182
-  RTC_LOG(LS_INFO) << "PipeWire stream format changed.";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   183
+  RTC_LOG(LS_INFO) << "PipeWire stream param changed.";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   184
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   185
-  if (!format) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   186
-    pw_stream_finish_format(that->pw_stream_, /*res=*/0, /*params=*/nullptr,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   187
-                            /*n_params=*/0);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   188
+  if (!format || id != SPA_PARAM_Format) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   189
     return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   190
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   191
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   192
-  that->spa_video_format_ = new spa_video_info_raw();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   193
-  spa_format_video_raw_parse(format, that->spa_video_format_,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   194
-                             &that->pw_type_->format_video);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   195
+  spa_format_video_raw_parse(format, &that->spa_video_format_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   196
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   197
-  auto width = that->spa_video_format_->size.width;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   198
-  auto height = that->spa_video_format_->size.height;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   199
+  auto width = that->spa_video_format_.size.width;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   200
+  auto height = that->spa_video_format_.size.height;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   201
   auto stride = SPA_ROUND_UP_N(width * kBytesPerPixel, 4);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   202
   auto size = height * stride;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   203
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   204
+  that->desktop_size_ = DesktopSize(width, height);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   205
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   206
   uint8_t buffer[1024] = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   207
   auto builder = spa_pod_builder{buffer, sizeof(buffer)};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   208
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   209
   // Setup buffers and meta header for new format.
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   210
-  const struct spa_pod* params[2];
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   211
-  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   212
-      &builder,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   213
-      // id to enumerate buffer requirements
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   214
-      that->pw_core_type_->param.idBuffers,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   215
-      that->pw_core_type_->param_buffers.Buffers,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   216
-      // Size: specified as integer (i) and set to specified size
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   217
-      ":", that->pw_core_type_->param_buffers.size, "i", size,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   218
-      // Stride: specified as integer (i) and set to specified stride
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   219
-      ":", that->pw_core_type_->param_buffers.stride, "i", stride,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   220
-      // Buffers: specifies how many buffers we want to deal with, set as
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   221
-      // integer (i) where preferred number is 8, then allowed number is defined
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   222
-      // as range (r) from min and max values and it is undecided (u) to allow
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   223
-      // negotiation
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   224
-      ":", that->pw_core_type_->param_buffers.buffers, "iru", 8,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   225
-      SPA_POD_PROP_MIN_MAX(1, 32),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   226
-      // Align: memory alignment of the buffer, set as integer (i) to specified
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   227
-      // value
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   228
-      ":", that->pw_core_type_->param_buffers.align, "i", 16));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   229
-  params[1] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   230
-      &builder,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   231
-      // id to enumerate supported metadata
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   232
-      that->pw_core_type_->param.idMeta, that->pw_core_type_->param_meta.Meta,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   233
-      // Type: specified as id or enum (I)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   234
-      ":", that->pw_core_type_->param_meta.type, "I",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   235
-      that->pw_core_type_->meta.Header,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   236
-      // Size: size of the metadata, specified as integer (i)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   237
-      ":", that->pw_core_type_->param_meta.size, "i",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   238
-      sizeof(struct spa_meta_header)));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   239
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   240
-  pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/2);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   241
+  const struct spa_pod* params[3];
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   242
+  params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   243
+              SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   244
+              SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   245
+              SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   246
+              SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32)));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   247
+  params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   248
+              SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   249
+              SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   250
+              SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   251
+  params[2] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   252
+              SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   253
+              SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   254
+              SPA_PARAM_META_size, SPA_POD_Int (sizeof(struct spa_meta_region))));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   255
+  pw_stream_update_params(that->pw_stream_, params, 3);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   256
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   257
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   258
 // static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   259
@@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProcess(void* data) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   260
   BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   261
   RTC_DCHECK(that);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   262
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   263
-  pw_buffer* buf = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   264
+  struct pw_buffer *next_buffer;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   265
+  struct pw_buffer *buffer = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   266
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   267
+  next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   268
+  while (next_buffer) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   269
+    buffer = next_buffer;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   270
+    next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   271
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   272
-  if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   273
+    if (next_buffer)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   274
+      pw_stream_queue_buffer (that->pw_stream_, buffer);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   275
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   276
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   277
+  if (!buffer) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   278
     return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   279
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   280
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   281
-  that->HandleBuffer(buf);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   282
+  that->HandleBuffer(buffer);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   283
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   284
-  pw_stream_queue_buffer(that->pw_stream_, buf);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   285
+  pw_stream_queue_buffer(that->pw_stream_, buffer);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   286
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   287
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   288
 BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   289
@@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   290
     pw_thread_loop_stop(pw_main_loop_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   291
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   292
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   293
-  if (pw_type_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   294
-    delete pw_type_;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   295
-  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   296
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   297
-  if (spa_video_format_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   298
-    delete spa_video_format_;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   299
-  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   300
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   301
   if (pw_stream_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   302
     pw_stream_destroy(pw_stream_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   303
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   304
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   305
-  if (pw_remote_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   306
-    pw_remote_destroy(pw_remote_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   307
+  if (pw_core_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   308
+    pw_core_disconnect(pw_core_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   309
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   310
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   311
-  if (pw_core_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   312
-    pw_core_destroy(pw_core_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   313
+  if (pw_context_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   314
+    pw_context_destroy(pw_context_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   315
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   316
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   317
   if (pw_main_loop_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   318
     pw_thread_loop_destroy(pw_main_loop_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   319
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   320
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   321
-  if (pw_loop_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   322
-    pw_loop_destroy(pw_loop_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   323
-  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   324
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   325
-  if (current_frame_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   326
-    free(current_frame_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   327
-  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   328
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   329
   if (start_request_signal_id_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   330
     g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   331
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   332
@@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal() {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   333
 void BaseCapturerPipeWire::InitPipeWire() {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   334
   pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   335
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   336
-  pw_loop_ = pw_loop_new(/*properties=*/nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   337
-  pw_main_loop_ = pw_thread_loop_new(pw_loop_, "pipewire-main-loop");
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   338
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   339
-  pw_core_ = pw_core_new(pw_loop_, /*properties=*/nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   340
-  pw_core_type_ = pw_core_get_type(pw_core_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   341
-  pw_remote_ = pw_remote_new(pw_core_, nullptr, /*user_data_size=*/0);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   342
+  pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   343
+  pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   344
+  if (!pw_context_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   345
+    RTC_LOG(LS_ERROR) << "Failed to create PipeWire context";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   346
+    return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   347
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   348
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   349
-  InitPipeWireTypes();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   350
+  pw_core_ = pw_context_connect(pw_context_, nullptr, 0);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   351
+  if (!pw_core_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   352
+    RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   353
+    return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   354
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   355
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   356
   // Initialize event handlers, remote end and stream-related.
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   357
-  pw_remote_events_.version = PW_VERSION_REMOTE_EVENTS;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   358
-  pw_remote_events_.state_changed = &OnStateChanged;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   359
+  pw_core_events_.version = PW_VERSION_CORE_EVENTS;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   360
+  pw_core_events_.error = &OnCoreError;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   361
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   362
   pw_stream_events_.version = PW_VERSION_STREAM_EVENTS;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   363
   pw_stream_events_.state_changed = &OnStreamStateChanged;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   364
-  pw_stream_events_.format_changed = &OnStreamFormatChanged;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   365
+  pw_stream_events_.param_changed = &OnStreamParamChanged;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   366
   pw_stream_events_.process = &OnStreamProcess;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   367
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   368
-  pw_remote_add_listener(pw_remote_, &spa_remote_listener_, &pw_remote_events_,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   369
-                         this);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   370
-  pw_remote_connect_fd(pw_remote_, pw_fd_);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   371
+  pw_core_add_listener(pw_core_, &spa_core_listener_, &pw_core_events_, this);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   372
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   373
+  pw_stream_ = CreateReceivingStream();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   374
+  if (!pw_stream_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   375
+    RTC_LOG(LS_ERROR) << "Failed to create PipeWire stream";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   376
+    return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   377
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   378
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   379
   if (pw_thread_loop_start(pw_main_loop_) < 0) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   380
     RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   381
@@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire() {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   382
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   383
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   384
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   385
-void BaseCapturerPipeWire::InitPipeWireTypes() {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   386
-  spa_type_map* map = pw_core_type_->map;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   387
-  pw_type_ = new PipeWireType();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   388
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   389
-  spa_type_media_type_map(map, &pw_type_->media_type);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   390
-  spa_type_media_subtype_map(map, &pw_type_->media_subtype);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   391
-  spa_type_format_video_map(map, &pw_type_->format_video);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   392
-  spa_type_video_format_map(map, &pw_type_->video_format);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   393
-}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   394
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   395
-void BaseCapturerPipeWire::CreateReceivingStream() {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   396
+pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   397
   spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   398
-  spa_rectangle pwScreenBounds =
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   399
-      spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   400
-                    static_cast<uint32_t>(desktop_size_.height())};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   401
+  spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   402
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   403
-  spa_fraction pwFrameRateMin = spa_fraction{0, 1};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   404
-  spa_fraction pwFrameRateMax = spa_fraction{60, 1};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   405
+  auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   406
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   407
-  pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   408
-                                                /*end of varargs*/ nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   409
-  pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   410
+  if (!stream) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   411
+    RTC_LOG(LS_ERROR) << "Could not create receiving stream.";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   412
+    return nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   413
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   414
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   415
   uint8_t buffer[1024] = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   416
-  const spa_pod* params[1];
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   417
-  spa_pod_builder builder = spa_pod_builder{buffer, sizeof(buffer)};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   418
-  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   419
-      &builder,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   420
-      // id to enumerate formats
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   421
-      pw_core_type_->param.idEnumFormat, pw_core_type_->spa_format, "I",
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   422
-      pw_type_->media_type.video, "I", pw_type_->media_subtype.raw,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   423
-      // Video format: specified as id or enum (I), preferred format is BGRx,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   424
-      // then allowed formats are enumerated (e) and the format is undecided (u)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   425
-      // to allow negotiation
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   426
-      ":", pw_type_->format_video.format, "Ieu", pw_type_->video_format.BGRx,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   427
-      SPA_POD_PROP_ENUM(2, pw_type_->video_format.RGBx,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   428
-                        pw_type_->video_format.BGRx),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   429
-      // Video size: specified as rectangle (R), preferred size is specified as
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   430
-      // first parameter, then allowed size is defined as range (r) from min and
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   431
-      // max values and the format is undecided (u) to allow negotiation
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   432
-      ":", pw_type_->format_video.size, "Rru", &pwScreenBounds, 2,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   433
-      &pwMinScreenBounds, &pwScreenBounds,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   434
-      // Frame rate: specified as fraction (F) and set to minimum frame rate
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   435
-      // value
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   436
-      ":", pw_type_->format_video.framerate, "F", &pwFrameRateMin,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   437
-      // Max frame rate: specified as fraction (F), preferred frame rate is set
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   438
-      // to maximum value, then allowed frame rate is defined as range (r) from
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   439
-      // min and max values and it is undecided (u) to allow negotiation
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   440
-      ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   441
-      &pwFrameRateMin, &pwFrameRateMax));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   442
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   443
-  pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   444
-                         this);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   445
+  const spa_pod* params[2];
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   446
+  spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   447
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   448
+  params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   449
+              SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   450
+              SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   451
+              SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   452
+              SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(5, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_RGBA,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   453
+                                                                 SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_BGRA),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   454
+              SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMinScreenBounds,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   455
+                                                                    &pwMinScreenBounds,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   456
+                                                                    &pwMaxScreenBounds),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   457
+              0));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   458
+  pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   459
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   460
   pw_stream_flags flags = static_cast<pw_stream_flags>(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   461
-      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   462
-      PW_STREAM_FLAG_MAP_BUFFERS);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   463
-  if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   464
-                        flags, params,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   465
-                        /*n_params=*/1) != 0) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   466
+      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   467
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   468
+  if (pw_stream_connect(stream, PW_DIRECTION_INPUT, pw_stream_node_id_, PW_STREAM_FLAG_AUTOCONNECT, params, 1) != 0) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   469
     RTC_LOG(LS_ERROR) << "Could not connect receiving stream.";
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   470
     portal_init_failed_ = true;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   471
-    return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   472
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   473
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   474
+  return stream;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   475
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   476
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   477
 void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   478
+  struct spa_meta_region* video_crop;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   479
   spa_buffer* spaBuffer = buffer->buffer;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   480
-  void* src = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   481
+  uint8_t *map = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   482
+  uint8_t* src = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   483
+  uint8_t* dst = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   484
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   485
+  if (spaBuffer->datas[0].chunk->size == 0) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   486
+    map = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   487
+    src = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   488
+  } else if (spaBuffer->datas[0].type == SPA_DATA_MemFd) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   489
+    map = static_cast<uint8_t*>(mmap(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   490
+        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   491
+        PROT_READ, MAP_PRIVATE, spaBuffer->datas[0].fd, 0));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   492
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   493
+    if (map == MAP_FAILED) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   494
+      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   495
+      return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   496
+    }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   497
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   498
+    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   499
+  } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   500
+    int fd;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   501
+    fd = spaBuffer->datas[0].fd;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   502
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   503
-  if (!(src = spaBuffer->datas[0].data)) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   504
+    map = static_cast<uint8_t*>(mmap(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   505
+        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   506
+        PROT_READ, MAP_PRIVATE, fd, 0));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   507
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   508
+    if (map == MAP_FAILED) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   509
+      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   510
+      return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   511
+    }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   512
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   513
+    SyncDmaBuf(fd, DMA_BUF_SYNC_START);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   514
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   515
+    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   516
+  } else if (spaBuffer->datas[0].type == SPA_DATA_MemPtr) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   517
+    map = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   518
+    src = static_cast<uint8_t*>(spaBuffer->datas[0].data);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   519
+  } else {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   520
     return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   521
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   522
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   523
-  uint32_t maxSize = spaBuffer->datas[0].maxsize;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   524
-  int32_t srcStride = spaBuffer->datas[0].chunk->stride;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   525
+  if (!src) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   526
+    return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   527
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   528
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   529
+  DesktopSize prev_crop_size = DesktopSize(0, 0);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   530
+  if (video_crop_size_initialized_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   531
+    prev_crop_size = video_crop_size_;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   532
+  }  
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   533
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   534
+  if ((video_crop = static_cast<struct spa_meta_region*>(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   535
+           spa_buffer_find_meta_data(spaBuffer, SPA_META_VideoCrop, sizeof(*video_crop))))) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   536
+    RTC_DCHECK(video_crop->region.size.width <= desktop_size_.width() &&
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   537
+               video_crop->region.size.height <= desktop_size_.height());
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   538
+    if ((video_crop->region.size.width != desktop_size_.width() ||
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   539
+        video_crop->region.size.height != desktop_size_.height()) && video_crop->region.size.width && video_crop->region.size.height) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   540
+      video_crop_size_ = DesktopSize(video_crop->region.size.width, video_crop->region.size.height);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   541
+      video_crop_size_initialized_ = true;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   542
+    } else {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   543
+      video_crop_size_initialized_ = false;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   544
+    }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   545
+  } else {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   546
+    video_crop_size_initialized_ = false;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   547
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   548
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   549
+  size_t frame_size;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   550
+  if (video_crop_size_initialized_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   551
+    frame_size =
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   552
+        video_crop_size_.width() * video_crop_size_.height() * kBytesPerPixel;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   553
+  } else {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   554
+    frame_size =
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   555
+        desktop_size_.width() * desktop_size_.height() * kBytesPerPixel;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   556
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   557
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   558
+  if (!current_frame_ ||
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   559
+      (video_crop_size_initialized_ && !video_crop_size_.equals(prev_crop_size))) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   560
+    current_frame_ = std::make_unique<uint8_t[]>(frame_size);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   561
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   562
+  RTC_DCHECK(current_frame_ != nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   563
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   564
+  const int32_t dstStride = video_crop_size_initialized_
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   565
+                                ? video_crop_size_.width() * kBytesPerPixel
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   566
+                                : desktop_size_.width() * kBytesPerPixel;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   567
+  const int32_t srcStride = spaBuffer->datas[0].chunk->stride;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   568
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   569
   if (srcStride != (desktop_size_.width() * kBytesPerPixel)) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   570
     RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   571
                       << srcStride
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   572
@@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   573
     return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   574
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   575
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   576
-  if (!current_frame_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   577
-    current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   578
+  dst = current_frame_.get();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   579
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   580
+  // Adjust source content based on crop video position
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   581
+  if (video_crop_size_initialized_ &&
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   582
+      (video_crop->region.position.y + video_crop_size_.height() <= desktop_size_.height())) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   583
+    for (int i = 0; i < video_crop->region.position.y; ++i) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   584
+      src += srcStride;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   585
+    }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   586
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   587
+  const int xOffset =
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   588
+      video_crop_size_initialized_ && (video_crop->region.position.x + video_crop_size_.width() <=
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   589
+                           desktop_size_.width())
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   590
+          ? video_crop->region.position.x * kBytesPerPixel
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   591
+          : 0;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   592
+  const int height = video_crop_size_initialized_ ? video_crop_size_.height() : desktop_size_.height();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   593
+  for (int i = 0; i < height; ++i) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   594
+    // Adjust source content based on crop video position if needed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   595
+    src += xOffset;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   596
+    std::memcpy(dst, src, dstStride);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   597
+    // If both sides decided to go with the RGBx format we need to convert it to
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   598
+    // BGRx to match color format expected by WebRTC.
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   599
+    if (spa_video_format_.format == SPA_VIDEO_FORMAT_RGBx ||
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   600
+        spa_video_format_.format == SPA_VIDEO_FORMAT_RGBA) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   601
+      ConvertRGBxToBGRx(dst, dstStride);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   602
+    }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   603
+    src += srcStride - xOffset;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   604
+    dst += dstStride;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   605
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   606
-  RTC_DCHECK(current_frame_ != nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   607
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   608
-  // If both sides decided to go with the RGBx format we need to convert it to
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   609
-  // BGRx to match color format expected by WebRTC.
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   610
-  if (spa_video_format_->format == pw_type_->video_format.RGBx) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   611
-    uint8_t* tempFrame = static_cast<uint8_t*>(malloc(maxSize));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   612
-    std::memcpy(tempFrame, src, maxSize);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   613
-    ConvertRGBxToBGRx(tempFrame, maxSize);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   614
-    std::memcpy(current_frame_, tempFrame, maxSize);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   615
-    free(tempFrame);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   616
-  } else {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   617
-    std::memcpy(current_frame_, src, maxSize);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   618
+  if (map) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   619
+    if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   620
+      SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_END);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   621
+    }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   622
+    munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   623
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   624
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   625
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   626
@@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartRequestResponseSignal(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   627
       g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   628
       RTC_DCHECK(options != nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   629
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   630
-      g_variant_lookup(options, "size", "(ii)", &width, &height);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   631
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   632
-      that->desktop_size_.set(width, height);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   633
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   634
+      that->pw_stream_node_id_ = stream_id;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   635
       g_variant_unref(options);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   636
       g_variant_unref(variant);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   637
     }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   638
@@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame() {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   639
     return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   640
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   641
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   642
-  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   643
+  DesktopSize frame_size = desktop_size_;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   644
+  if (video_crop_size_initialized_) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   645
+    frame_size = video_crop_size_;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   646
+  }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   647
+  
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   648
+  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(frame_size));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   649
   result->CopyPixelsFrom(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   650
-      current_frame_, (desktop_size_.width() * kBytesPerPixel),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   651
-      DesktopRect::MakeWH(desktop_size_.width(), desktop_size_.height()));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   652
+      current_frame_.get(), (frame_size.width() * kBytesPerPixel),
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   653
+      DesktopRect::MakeWH(frame_size.width(), frame_size.height()));
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   654
   if (!result) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   655
     callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   656
     return;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   657
@@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   658
   return true;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   659
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   660
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   661
+// static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   662
+std::unique_ptr<DesktopCapturer>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   663
+BaseCapturerPipeWire::CreateRawScreenCapturer(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   664
+    const DesktopCaptureOptions& options) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   665
+  std::unique_ptr<BaseCapturerPipeWire> capturer =
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   666
+      std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   667
+  return std::move(capturer);}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   668
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   669
+// static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   670
+std::unique_ptr<DesktopCapturer>
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   671
+BaseCapturerPipeWire::CreateRawWindowCapturer(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   672
+    const DesktopCaptureOptions& options) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   673
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   674
+  std::unique_ptr<BaseCapturerPipeWire> capturer =
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   675
+      std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   676
+  return std::move(capturer);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   677
+}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   678
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   679
 }  // namespace webrtc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   680
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
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   681
index 56b101acbaa6..de54157d1a2a 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   682
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   683
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   684
@@ -22,17 +22,13 @@
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   685
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   686
 namespace webrtc {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   687
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   688
-class PipeWireType {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   689
- public:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   690
-  spa_type_media_type media_type;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   691
-  spa_type_media_subtype media_subtype;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   692
-  spa_type_format_video format_video;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   693
-  spa_type_video_format video_format;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   694
-};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   695
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   696
 class BaseCapturerPipeWire : public DesktopCapturer {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   697
  public:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   698
-  enum CaptureSourceType { Screen = 1, Window };
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   699
+  enum CaptureSourceType : uint32_t {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   700
+    kScreen = 0b01,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   701
+    kWindow = 0b10,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   702
+    kAny = 0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   703
+  };
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   704
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   705
   explicit BaseCapturerPipeWire(CaptureSourceType source_type);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   706
   ~BaseCapturerPipeWire() override;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   707
@@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public DesktopCapturer {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   708
   bool GetSourceList(SourceList* sources) override;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   709
   bool SelectSource(SourceId id) override;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   710
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   711
+  static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   712
+      const DesktopCaptureOptions& options);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   713
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   714
+  static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   715
+      const DesktopCaptureOptions& options);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   716
+
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   717
  private:
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   718
   // PipeWire types -->
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   719
+  pw_context* pw_context_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   720
   pw_core* pw_core_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   721
-  pw_type* pw_core_type_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   722
   pw_stream* pw_stream_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   723
-  pw_remote* pw_remote_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   724
-  pw_loop* pw_loop_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   725
   pw_thread_loop* pw_main_loop_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   726
-  PipeWireType* pw_type_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   727
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   728
+  spa_hook spa_core_listener_ = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   729
   spa_hook spa_stream_listener_ = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   730
-  spa_hook spa_remote_listener_ = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   731
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   732
+  pw_core_events pw_core_events_ = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   733
   pw_stream_events pw_stream_events_ = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   734
-  pw_remote_events pw_remote_events_ = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   735
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   736
-  spa_video_info_raw* spa_video_format_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   737
+  struct spa_video_info_raw spa_video_format_;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   738
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   739
+  guint32 pw_stream_node_id_ = 0;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   740
   gint32 pw_fd_ = -1;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   741
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   742
   CaptureSourceType capture_source_type_ =
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   743
-      BaseCapturerPipeWire::CaptureSourceType::Screen;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   744
+      BaseCapturerPipeWire::CaptureSourceType::kAny;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   745
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   746
   // <-- end of PipeWire types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   747
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   748
@@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public DesktopCapturer {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   749
   guint sources_request_signal_id_ = 0;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   750
   guint start_request_signal_id_ = 0;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   751
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   752
+  bool video_crop_size_initialized_ = false;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   753
+  DesktopSize video_crop_size_;;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   754
   DesktopSize desktop_size_ = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   755
   DesktopCaptureOptions options_ = {};
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   756
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   757
-  uint8_t* current_frame_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   758
+  std::unique_ptr<uint8_t[]> current_frame_;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   759
   Callback* callback_ = nullptr;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   760
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   761
   bool portal_init_failed_ = false;
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   762
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   763
   void InitPortal();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   764
   void InitPipeWire();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   765
-  void InitPipeWireTypes();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   766
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   767
-  void CreateReceivingStream();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   768
+  pw_stream* CreateReceivingStream();
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   769
   void HandleBuffer(pw_buffer* buffer);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   770
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   771
   void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   772
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   773
-  static void OnStateChanged(void* data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   774
-                             pw_remote_state old_state,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   775
-                             pw_remote_state state,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   776
-                             const char* error);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   777
+  static void SyncDmaBuf(int fd, uint64_t start_or_end);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   778
+  static void OnCoreError(void *data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   779
+                          uint32_t id,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   780
+                          int seq,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   781
+                          int res,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   782
+                          const char *message);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   783
+  static void OnStreamParamChanged(void *data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   784
+                                   uint32_t id,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   785
+                                   const struct spa_pod *format);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   786
   static void OnStreamStateChanged(void* data,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   787
                                    pw_stream_state old_state,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   788
                                    pw_stream_state state,
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   789
                                    const char* error_message);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   790
-
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   791
-  static void OnStreamFormatChanged(void* data, const struct spa_pod* format);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   792
   static void OnStreamProcess(void* data);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   793
   static void OnNewBuffer(void* data, uint32_t id);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   794
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   795
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
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   796
index 26956fc67dc8..3813d697bb38 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   797
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   798
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   799
@@ -15,7 +15,7 @@
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   800
 namespace webrtc {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   801
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   802
 ScreenCapturerPipeWire::ScreenCapturerPipeWire()
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   803
-    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   804
+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kScreen) {}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   805
 ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   806
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   807
 // static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   808
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
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   809
index 35436475cb4d..c43a1f1a0c4e 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   810
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   811
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   812
@@ -15,7 +15,7 @@
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   813
 namespace webrtc {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   814
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   815
 WindowCapturerPipeWire::WindowCapturerPipeWire()
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   816
-    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   817
+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kWindow) {}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   818
 WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   819
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   820
 // static
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   821
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
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   822
index cf8a9dd0e0db..d27fab8d28d9 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   823
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   824
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   825
@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   826
     const DesktopCaptureOptions& options) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   827
 #if defined(WEBRTC_USE_PIPEWIRE)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   828
   if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   829
-    return ScreenCapturerPipeWire::CreateRawScreenCapturer(options);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   830
+    return BaseCapturerPipeWire::CreateRawScreenCapturer(options);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   831
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   832
 #endif  // defined(WEBRTC_USE_PIPEWIRE)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   833
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   834
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
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   835
index 82359e50c2db..bb9724cf7cc2 100644
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   836
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   837
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   838
@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   839
     const DesktopCaptureOptions& options) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   840
 #if defined(WEBRTC_USE_PIPEWIRE)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   841
   if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   842
-    return WindowCapturerPipeWire::CreateRawWindowCapturer(options);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   843
+    return BaseCapturerPipeWire::CreateRawWindowCapturer(options);
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   844
   }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   845
 #endif  // defined(WEBRTC_USE_PIPEWIRE)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   846