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
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Fri, 2 Feb 2024 18:43:00 +0000
|
|
Subject: Bug 1878010 - Fix webrtc::VideoCaptureFactory for BSD.
|
|
r=grulja,gaston,webrtc-reviewers,mjf
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D200427
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/f890637efe5abc0020fab83ff2224313cd0c8460
|
|
---
|
|
modules/video_capture/video_capture_factory.cc | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/video_capture_factory.cc b/modules/video_capture/video_capture_factory.cc
|
|
index 127bb06a2e..0d12966c2e 100644
|
|
--- a/modules/video_capture/video_capture_factory.cc
|
|
+++ b/modules/video_capture/video_capture_factory.cc
|
|
@@ -24,7 +24,7 @@ rtc::scoped_refptr<VideoCaptureModule> VideoCaptureFactory::Create(
|
|
[[maybe_unused]] const char* deviceUniqueIdUTF8) {
|
|
// This is only implemented on pure Linux and WEBRTC_LINUX is defined for
|
|
// Android as well
|
|
-#if !defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
|
|
+#if (!defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)) || defined(WEBRTC_ANDROID)
|
|
return nullptr;
|
|
#else
|
|
return videocapturemodule::VideoCaptureImpl::Create(options,
|
|
@@ -40,7 +40,7 @@ VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo(
|
|
[[maybe_unused]] VideoCaptureOptions* options) {
|
|
// This is only implemented on pure Linux and WEBRTC_LINUX is defined for
|
|
// Android as well
|
|
-#if !defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
|
|
+#if (!defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)) || defined(WEBRTC_ANDROID)
|
|
return nullptr;
|
|
#else
|
|
return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(options);
|