38 'pk11priv.h', |
38 'pk11priv.h', |
39 'pk11pub.h', |
39 'pk11pub.h', |
40 'pk11sdr.h', |
40 'pk11sdr.h', |
41 'pkcs11f.h', |
41 'pkcs11f.h', |
42 'pkcs11.h', |
42 'pkcs11.h', |
43 diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn |
43 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/BUILD.gn b/third_party/libwebrtc/webrtc/modules/desktop_capture/BUILD.gn |
44 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn |
44 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/BUILD.gn |
45 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn |
45 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/BUILD.gn |
46 @@ -153,17 +153,17 @@ if (rtc_include_tests) { |
46 @@ -153,17 +153,17 @@ if (rtc_include_tests) { |
47 "../../test:test_support", |
47 "../../test:test_support", |
48 ] |
48 ] |
49 } |
49 } |
50 } |
50 } |
60 |
60 |
61 pkg_config("gio") { |
61 pkg_config("gio") { |
62 packages = [ |
62 packages = [ |
63 "gio-2.0", |
63 "gio-2.0", |
64 "gio-unix-2.0", |
64 "gio-unix-2.0", |
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 |
65 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build |
66 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build |
66 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build |
67 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build |
67 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build |
68 @@ -112,16 +112,39 @@ if CONFIG["OS_TARGET"] == "DragonFly": |
68 @@ -112,16 +112,39 @@ if CONFIG["OS_TARGET"] == "DragonFly": |
69 "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_atom_cache.cc", |
69 "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/x_atom_cache.cc", |
70 "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_error_trap.cc", |
70 "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/x_error_trap.cc", |
71 "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", |
71 "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", |
72 "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc", |
72 "/third_party/libwebrtc/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc", |
73 "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc", |
73 "/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc", |
74 "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc" |
74 "/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc" |
75 ] |
75 ] |
76 |
76 |
77 +# PipeWire specific files |
77 +# PipeWire specific files |
78 +if CONFIG["OS_TARGET"] == "Linux": |
78 +if CONFIG["OS_TARGET"] == "Linux": |
79 + |
79 + |
90 + CXXFLAGS += CONFIG['TK_CFLAGS'] |
90 + CXXFLAGS += CONFIG['TK_CFLAGS'] |
91 + CXXFLAGS += [ "-I/usr/include/pipewire-0.3" ] |
91 + CXXFLAGS += [ "-I/usr/include/pipewire-0.3" ] |
92 + CXXFLAGS += [ "-I/usr/include/spa-0.2" ] |
92 + CXXFLAGS += [ "-I/usr/include/spa-0.2" ] |
93 + |
93 + |
94 + UNIFIED_SOURCES += [ |
94 + UNIFIED_SOURCES += [ |
95 + "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc", |
95 + "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc", |
96 + "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc", |
96 + "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc", |
97 + "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc" |
97 + "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc" |
98 + ] |
98 + ] |
99 + |
99 + |
100 if CONFIG["OS_TARGET"] == "FreeBSD": |
100 if CONFIG["OS_TARGET"] == "FreeBSD": |
101 |
101 |
102 DEFINES["USE_X11"] = "1" |
102 DEFINES["USE_X11"] = "1" |
103 DEFINES["WEBRTC_BSD"] = True |
103 DEFINES["WEBRTC_BSD"] = True |
104 DEFINES["WEBRTC_POSIX"] = True |
104 DEFINES["WEBRTC_POSIX"] = True |
105 DEFINES["_FILE_OFFSET_BITS"] = "64" |
105 DEFINES["_FILE_OFFSET_BITS"] = "64" |
106 |
106 |
107 OS_LIBS += [ |
107 OS_LIBS += [ |
108 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 |
108 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_options.h b/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_options.h |
109 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h |
109 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_options.h |
110 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h |
110 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_options.h |
111 @@ -136,15 +136,15 @@ class DesktopCaptureOptions { |
111 @@ -136,15 +136,15 @@ class DesktopCaptureOptions { |
112 #if defined(USE_X11) |
112 #if defined(USE_X11) |
113 bool use_update_notifications_ = false; |
113 bool use_update_notifications_ = false; |
114 #else |
114 #else |
115 bool use_update_notifications_ = true; |
115 bool use_update_notifications_ = true; |
123 }; |
123 }; |
124 |
124 |
125 } // namespace webrtc |
125 } // namespace webrtc |
126 |
126 |
127 #endif // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ |
127 #endif // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ |
128 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 |
128 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc |
129 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc |
129 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc |
130 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc |
130 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc |
131 @@ -10,18 +10,21 @@ |
131 @@ -10,18 +10,21 @@ |
132 |
132 |
133 #include "modules/desktop_capture/linux/base_capturer_pipewire.h" |
133 #include "modules/desktop_capture/linux/base_capturer_pipewire.h" |
134 |
134 |
135 #include <gio/gunixfdlist.h> |
135 #include <gio/gunixfdlist.h> |
784 + std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny); |
784 + std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny); |
785 + return std::move(capturer); |
785 + return std::move(capturer); |
786 +} |
786 +} |
787 + |
787 + |
788 } // namespace webrtc |
788 } // namespace webrtc |
789 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 |
789 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h |
790 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h |
790 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h |
791 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h |
791 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h |
792 @@ -17,99 +17,103 @@ |
792 @@ -17,99 +17,103 @@ |
793 #include <spa/param/video/format-utils.h> |
793 #include <spa/param/video/format-utils.h> |
794 |
794 |
795 #include "modules/desktop_capture/desktop_capture_options.h" |
795 #include "modules/desktop_capture/desktop_capture_options.h" |
796 #include "modules/desktop_capture/desktop_capturer.h" |
796 #include "modules/desktop_capture/desktop_capturer.h" |
917 guint SetupRequestResponseSignal(const gchar* object_path, |
917 guint SetupRequestResponseSignal(const gchar* object_path, |
918 GDBusSignalCallback callback); |
918 GDBusSignalCallback callback); |
919 |
919 |
920 static void OnProxyRequested(GObject* object, |
920 static void OnProxyRequested(GObject* object, |
921 GAsyncResult* result, |
921 GAsyncResult* result, |
922 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 |
922 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc |
923 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc |
923 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc |
924 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc |
924 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc |
925 @@ -10,17 +10,17 @@ |
925 @@ -10,17 +10,17 @@ |
926 |
926 |
927 #include "modules/desktop_capture/linux/screen_capturer_pipewire.h" |
927 #include "modules/desktop_capture/linux/screen_capturer_pipewire.h" |
928 |
928 |
929 #include <memory> |
929 #include <memory> |
939 std::unique_ptr<DesktopCapturer> |
939 std::unique_ptr<DesktopCapturer> |
940 ScreenCapturerPipeWire::CreateRawScreenCapturer( |
940 ScreenCapturerPipeWire::CreateRawScreenCapturer( |
941 const DesktopCaptureOptions& options) { |
941 const DesktopCaptureOptions& options) { |
942 return std::make_unique<ScreenCapturerPipeWire>(); |
942 return std::make_unique<ScreenCapturerPipeWire>(); |
943 } |
943 } |
944 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 |
944 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc |
945 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc |
945 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc |
946 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc |
946 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc |
947 @@ -10,17 +10,17 @@ |
947 @@ -10,17 +10,17 @@ |
948 |
948 |
949 #include "modules/desktop_capture/linux/window_capturer_pipewire.h" |
949 #include "modules/desktop_capture/linux/window_capturer_pipewire.h" |
950 |
950 |
951 #include <memory> |
951 #include <memory> |
961 std::unique_ptr<DesktopCapturer> |
961 std::unique_ptr<DesktopCapturer> |
962 WindowCapturerPipeWire::CreateRawWindowCapturer( |
962 WindowCapturerPipeWire::CreateRawWindowCapturer( |
963 const DesktopCaptureOptions& options) { |
963 const DesktopCaptureOptions& options) { |
964 return std::make_unique<WindowCapturerPipeWire>(); |
964 return std::make_unique<WindowCapturerPipeWire>(); |
965 } |
965 } |
966 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 |
966 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc |
967 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc |
967 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc |
968 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc |
968 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/screen_capturer_linux.cc |
969 @@ -21,17 +21,17 @@ |
969 @@ -21,17 +21,17 @@ |
970 |
970 |
971 namespace webrtc { |
971 namespace webrtc { |
972 |
972 |
973 // static |
973 // static |
983 #if defined(USE_X11) |
983 #if defined(USE_X11) |
984 return ScreenCapturerX11::CreateRawScreenCapturer(options); |
984 return ScreenCapturerX11::CreateRawScreenCapturer(options); |
985 #endif // defined(USE_X11) |
985 #endif // defined(USE_X11) |
986 |
986 |
987 return nullptr; |
987 return nullptr; |
988 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 |
988 diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc |
989 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc |
989 --- a/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc |
990 +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc |
990 +++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc |
991 @@ -21,17 +21,17 @@ |
991 @@ -21,17 +21,17 @@ |
992 |
992 |
993 namespace webrtc { |
993 namespace webrtc { |
994 |
994 |
995 // static |
995 // static |