Michael Froman
e64b031d2e
Upstream commit: https://webrtc.googlesource.com/src/+/0590643ffe94b4d8b3d3bf6ab4d7deaa506083f3 Move the below build targets to api/video: - adapted_video_track_source - video_adapter - video_broadcaster - video_common These targets are meant to replace rtc_media_base. Change-Id: Iaa69cd8379f66f98d618ac2e4fb6ffb4a1806f50 Bug: webrtc:42225070 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/483960 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#48064}
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
Date: Thu, 23 May 2024 17:28:00 +0000
|
|
Subject: Bug 1897459 - P2 - for BSD reference null socket server
|
|
instead;r=mjf,webrtc-reviewers
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D211095
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0993ae41fb7db1624dedc5cf2278cd5a505f18f5
|
|
---
|
|
rtc_base/internal/default_socket_server.cc | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/rtc_base/internal/default_socket_server.cc b/rtc_base/internal/default_socket_server.cc
|
|
index d49c2bba32..521f21f538 100644
|
|
--- a/rtc_base/internal/default_socket_server.cc
|
|
+++ b/rtc_base/internal/default_socket_server.cc
|
|
@@ -13,12 +13,21 @@
|
|
#include <memory>
|
|
|
|
#include "rtc_base/socket_server.h"
|
|
+
|
|
+#if defined(WEBRTC_BSD)
|
|
+#include "rtc_base/null_socket_server.h"
|
|
+#else
|
|
#include "rtc_base/physical_socket_server.h"
|
|
+#endif
|
|
|
|
namespace webrtc {
|
|
|
|
std::unique_ptr<SocketServer> CreateDefaultSocketServer() {
|
|
+#if defined(WEBRTC_BSD)
|
|
+ return std::unique_ptr<SocketServer>(new NullSocketServer);
|
|
+#else
|
|
return std::unique_ptr<SocketServer>(new PhysicalSocketServer);
|
|
+#endif
|
|
}
|
|
|
|
} // namespace webrtc
|