Nico Grunbaum
3b3a29acfa
Upstream commit: https://webrtc.googlesource.com/src/+/7e3a9ce99d832687d1eef3eaa270754970a761b0 Rely on TaskQueueBase interface in modules/rtp_rtcp Instead of requiring Thread to be passed to the RtpVideoStreamReceiverFrameTransformerDelegate. This class already uses it only though the TaskQueueBase interface. In tests rely on RunLoop helper when test makes calls that are required to be done on the same task queue, and rely on TaskQueueForTests where test does not make such calls. Bug: webrtc:42225410 Change-Id: I7aba5c696436d8ce43c85ccba5b9448e852ea81d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/470880 Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Erik Språng <sprang@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47662}
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 d52f31b12d..98e5e5e298 100644
|
|
--- a/modules/video_capture/video_capture_factory.cc
|
|
+++ b/modules/video_capture/video_capture_factory.cc
|
|
@@ -28,7 +28,7 @@ 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(
|
|
@@ -44,7 +44,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);
|