06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
89 lines
3.1 KiB
Diff
89 lines
3.1 KiB
Diff
From: Landry Breuil <landry@openbsd.org>
|
|
Date: Wed, 22 Dec 2021 00:09:00 +0000
|
|
Subject: Bug 1654448 - P2 - readd partial support for BSD to webrtc
|
|
build;r=mjf
|
|
|
|
only OpenBSD/amd64 is supported for now
|
|
|
|
Depends on D134432
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D134433
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0300b32b7de70fb8976dc82d7d3bb3adb9685857
|
|
---
|
|
BUILD.gn | 3 +++
|
|
modules/video_capture/BUILD.gn | 2 +-
|
|
modules/video_capture/linux/device_info_v4l2.h | 2 ++
|
|
rtc_base/platform_thread_types.cc | 4 +++-
|
|
webrtc.gni | 2 +-
|
|
5 files changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
|
index 52da18d3ee..f67e79408d 100644
|
|
--- a/BUILD.gn
|
|
+++ b/BUILD.gn
|
|
@@ -223,6 +223,9 @@ config("common_inherited_config") {
|
|
if (is_linux || is_chromeos) {
|
|
defines += [ "WEBRTC_LINUX" ]
|
|
}
|
|
+ if (is_bsd) {
|
|
+ defines += [ "WEBRTC_BSD" ]
|
|
+ }
|
|
if (is_mac) {
|
|
defines += [ "WEBRTC_MAC" ]
|
|
}
|
|
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
|
|
index 1a737e1596..b47765018d 100644
|
|
--- a/modules/video_capture/BUILD.gn
|
|
+++ b/modules/video_capture/BUILD.gn
|
|
@@ -72,7 +72,7 @@ if (!build_with_chromium || is_linux || is_chromeos) {
|
|
"video_capture_options.h",
|
|
]
|
|
|
|
- if (is_linux || is_chromeos) {
|
|
+ if (is_linux || is_bsd || is_chromeos) {
|
|
sources += [
|
|
"linux/device_info_linux.cc",
|
|
"linux/device_info_v4l2.cc",
|
|
diff --git a/modules/video_capture/linux/device_info_v4l2.h b/modules/video_capture/linux/device_info_v4l2.h
|
|
index e3c2395f49..119cb07ab8 100644
|
|
--- a/modules/video_capture/linux/device_info_v4l2.h
|
|
+++ b/modules/video_capture/linux/device_info_v4l2.h
|
|
@@ -16,7 +16,9 @@
|
|
#include "modules/video_capture/device_info_impl.h"
|
|
|
|
#include "rtc_base/platform_thread.h"
|
|
+#ifdef WEBRTC_LINUX
|
|
#include <sys/inotify.h>
|
|
+#endif
|
|
|
|
struct v4l2_capability;
|
|
|
|
diff --git a/rtc_base/platform_thread_types.cc b/rtc_base/platform_thread_types.cc
|
|
index d64ea689bb..c3c6955a7b 100644
|
|
--- a/rtc_base/platform_thread_types.cc
|
|
+++ b/rtc_base/platform_thread_types.cc
|
|
@@ -50,7 +50,9 @@ PlatformThreadId CurrentThreadId() {
|
|
return static_cast<PlatformThreadId>(pthread_self());
|
|
#else
|
|
// Default implementation for nacl and solaris.
|
|
- return reinterpret_cast<PlatformThreadId>(pthread_self());
|
|
+ // WEBRTC_BSD: pthread_t is a pointer, so cannot be casted to pid_t
|
|
+ // (aka int32_t) on 64-bit archs. Required on OpenBSD.
|
|
+ return reinterpret_cast<long>(pthread_self());
|
|
#endif
|
|
#endif // defined(WEBRTC_POSIX)
|
|
}
|
|
diff --git a/webrtc.gni b/webrtc.gni
|
|
index dc0553d964..c67c8d5ea5 100644
|
|
--- a/webrtc.gni
|
|
+++ b/webrtc.gni
|
|
@@ -356,7 +356,7 @@ rtc_opus_dir = "//third_party/opus"
|
|
|
|
# Desktop capturer is supported only on Windows, OSX and Linux.
|
|
rtc_desktop_capture_supported =
|
|
- (is_win && current_os != "winuwp") || is_mac ||
|
|
+ (is_win && current_os != "winuwp") || is_mac || is_bsd ||
|
|
((is_linux || is_chromeos) && (rtc_use_x11_extensions || rtc_use_pipewire))
|
|
|
|
###############################################################################
|