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