Michael Froman
f844f6ea99
Upstream commit: https://webrtc.googlesource.com/src/+/91dbc17ae49f9fbf2071b5d60bf1b823973c4a4f Remove the deprecated rtc_media_base build target. Also remove the associated header file that are just redirecting to api/video. Change-Id: I847cdd78a63e786ecc72b478f2cdfdeaecc72ada Bug: webrtc:42225070 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/486820 Commit-Queue: Jeremy Leconte <jleconte@google.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48117}
58 lines
2.7 KiB
Diff
58 lines
2.7 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
Date: Tue, 6 Jun 2023 16:37:00 -0700
|
|
Subject: Bug 1833237 - (fix-f0be3bee1f) remove reference to
|
|
portal:pipewire_base;r?pehrsons
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8ff886a4d366b4be35b329d1ef733a6df542067c
|
|
---
|
|
modules/video_capture/BUILD.gn | 4 ++++
|
|
modules/video_capture/linux/device_info_pipewire.cc | 4 ++--
|
|
modules/video_capture/linux/device_info_pipewire.h | 3 ++-
|
|
3 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
|
|
index 5c81c975df..83dc72ba53 100644
|
|
--- a/modules/video_capture/BUILD.gn
|
|
+++ b/modules/video_capture/BUILD.gn
|
|
@@ -112,6 +112,10 @@ if (!build_with_chromium || is_linux || is_chromeos) {
|
|
"../../common_video",
|
|
"../portal",
|
|
]
|
|
+ if (build_with_mozilla) {
|
|
+ configs -= [ "../portal:pipewire_base" ]
|
|
+ public_deps = [ "//third_party/pipewire" ]
|
|
+ }
|
|
}
|
|
}
|
|
if (is_win) {
|
|
diff --git a/modules/video_capture/linux/device_info_pipewire.cc b/modules/video_capture/linux/device_info_pipewire.cc
|
|
index 7eaf5fbd70..7748fcf08f 100644
|
|
--- a/modules/video_capture/linux/device_info_pipewire.cc
|
|
+++ b/modules/video_capture/linux/device_info_pipewire.cc
|
|
@@ -43,9 +43,9 @@ int32_t DeviceInfoPipeWire::GetDeviceName(uint32_t deviceNumber,
|
|
char* deviceUniqueIdUTF8,
|
|
uint32_t deviceUniqueIdUTF8Length,
|
|
char* productUniqueIdUTF8,
|
|
- uint32_t productUniqueIdUTF8Length) {
|
|
+ uint32_t productUniqueIdUTF8Length,
|
|
+ pid_t* pid) {
|
|
RTC_CHECK(pipewire_session_);
|
|
-
|
|
if (deviceNumber >= NumberOfDevices())
|
|
return -1;
|
|
|
|
diff --git a/modules/video_capture/linux/device_info_pipewire.h b/modules/video_capture/linux/device_info_pipewire.h
|
|
index 5d0fc6740a..b3e6de6fee 100644
|
|
--- a/modules/video_capture/linux/device_info_pipewire.h
|
|
+++ b/modules/video_capture/linux/device_info_pipewire.h
|
|
@@ -31,7 +31,8 @@ class DeviceInfoPipeWire : public DeviceInfoImpl {
|
|
char* deviceUniqueIdUTF8,
|
|
uint32_t deviceUniqueIdUTF8Length,
|
|
char* productUniqueIdUTF8 = nullptr,
|
|
- uint32_t productUniqueIdUTF8Length = 0) override;
|
|
+ uint32_t productUniqueIdUTF8Length = 0,
|
|
+ pid_t* pid = 0) override;
|
|
/*
|
|
* Fills the membervariable _captureCapabilities with capabilites for the
|
|
* given device name.
|