commit 987696f776908b55367df630d7d67f730eada2af parent 8d793e598be9a17c6c18358afde2b68c5464440d Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 15 Oct 2025 10:50:36 -0500 Bug 1993083 - Vendor libwebrtc from c31ba18698 Upstream commit: https://webrtc.googlesource.com/src/+/c31ba186980d73040bbd114e138ceb4c1e0dd1e8 Remove __native_client__ support NaCL was deprecated in 2020 and EOL in in ChromeOS 138: https://developer.chrome.com/docs/native-client Bug: None Change-Id: I1d59dff4c3358876eaa16518eb0e8c3275467c5c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/402422 Commit-Queue: Philipp Hancke <phancke@meta.com> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45231} Diffstat:
37 files changed, 87 insertions(+), 143 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-10T04:46:01.971289+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T15:50:27.199001+00:00. # base of lastest vendoring -3a180a5417 +c31ba18698 diff --git a/third_party/libwebrtc/g3doc/supported-platforms-and-compilers.md b/third_party/libwebrtc/g3doc/supported-platforms-and-compilers.md @@ -32,3 +32,6 @@ for some clang related documentation from Chromium. Other compilers are not officially supported (which means there is no CI coverage for them) but patches to keep WebRTC working with them are welcomed by the WebRTC Team. + +For Microsofts Visual C++ compiler the minimum supported version is `_MSC_VER 1929` +which means Visual Studio 2019 version 16.11 or higher. diff --git a/third_party/libwebrtc/moz-patch-stack/s0001.patch b/third_party/libwebrtc/moz-patch-stack/s0001.patch @@ -1383,7 +1383,7 @@ index d5ce6105a3..8bfd24de2b 100644 const bool enable_svc_for_simulcast_; std::optional<SimulcastToSvcConverter> simulcast_to_svc_converter_; diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index fdf70e2756..9e5dfe3c6e 100644 +index 62268d946d..9744edba44 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -449,6 +449,12 @@ rtc_library("logging") { @@ -1446,7 +1446,7 @@ index f157205e7d..fe82a4bb4c 100644 // The list of logging streams currently configured. // Note: we explicitly do not clean this up, because of the uncertain ordering diff --git a/rtc_base/logging.h b/rtc_base/logging.h -index c24826dde4..937e0edd30 100644 +index 0023684501..a04fc4b2ed 100644 --- a/rtc_base/logging.h +++ b/rtc_base/logging.h @@ -554,6 +554,12 @@ class LogMessage { diff --git a/third_party/libwebrtc/moz-patch-stack/s0009.patch b/third_party/libwebrtc/moz-patch-stack/s0009.patch @@ -42,10 +42,10 @@ index 6452a3c235..9f7f3ea508 100644 int32_t DeviceInfoV4l2::Init() { return 0; diff --git a/rtc_base/byte_order.h b/rtc_base/byte_order.h -index ba58571aca..dddaf9600b 100644 +index 3a9bfe46e0..2b13e69251 100644 --- a/rtc_base/byte_order.h +++ b/rtc_base/byte_order.h -@@ -90,6 +90,8 @@ +@@ -82,6 +82,8 @@ #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined. #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) @@ -68,27 +68,27 @@ index 32e2eb35b2..0ce48a02f1 100644 if (number_of_cores <= 0) { RTC_LOG(LS_ERROR) << "Failed to get number of cores"; diff --git a/rtc_base/physical_socket_server.cc b/rtc_base/physical_socket_server.cc -index 8a2f3f2185..ae982fcc08 100644 +index 2116af1381..1e10bc8c2f 100644 --- a/rtc_base/physical_socket_server.cc +++ b/rtc_base/physical_socket_server.cc -@@ -80,7 +80,10 @@ +@@ -78,7 +78,10 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX --#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) -+#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__) +-#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) ++#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) +#if defined(WEBRTC_LINUX) +#include <linux/sockios.h> +#endif int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl); -@@ -700,7 +703,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) { +@@ -698,7 +701,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) { *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; --#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__) -+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__) +-#elif defined(WEBRTC_MAC) || defined(BSD) ++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; #elif defined(WEBRTC_POSIX) diff --git a/third_party/libwebrtc/moz-patch-stack/s0010.patch b/third_party/libwebrtc/moz-patch-stack/s0010.patch @@ -15,10 +15,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/2b079067648bfe0d0 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtc_base/physical_socket_server.cc b/rtc_base/physical_socket_server.cc -index ae982fcc08..b40fe158df 100644 +index 1e10bc8c2f..a807079917 100644 --- a/rtc_base/physical_socket_server.cc +++ b/rtc_base/physical_socket_server.cc -@@ -1550,7 +1550,7 @@ bool PhysicalSocketServer::WaitSelect(int cmsWait, bool process_io) { +@@ -1548,7 +1548,7 @@ bool PhysicalSocketServer::WaitSelect(int cmsWait, bool process_io) { int fd = pdispatcher->GetDescriptor(); // "select"ing a file descriptor that is equal to or larger than // FD_SETSIZE will result in undefined behavior. diff --git a/third_party/libwebrtc/moz-patch-stack/s0011.patch b/third_party/libwebrtc/moz-patch-stack/s0011.patch @@ -21,7 +21,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/e83c311e5293902be 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc -index 7f11696b21..2320fa5172 100644 +index 861dacae95..927c92d0e9 100644 --- a/rtc_base/platform_thread.cc +++ b/rtc_base/platform_thread.cc @@ -197,15 +197,17 @@ PlatformThread PlatformThread::SpawnThread( diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -69,11 +69,11 @@ Bug 1883116 - (fix-3d9c3687a4) Supporting change of call_factory.cc to create_ca Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b86cb7278bc4e557104cec0313d83511b9c8f40d --- .gn | 2 + - BUILD.gn | 46 ++++++++++++++++++- + BUILD.gn | 45 ++++++++++++++++++- api/BUILD.gn | 37 ++++++++++++++- api/rtp_sender_interface.h | 4 +- api/rtp_sender_setparameters_callback.cc | 27 +++++++++++ - api/rtp_sender_setparameters_callback.h | 28 +++++++++++ + api/rtp_sender_setparameters_callback.h | 28 ++++++++++++ api/task_queue/BUILD.gn | 2 + api/transport/BUILD.gn | 2 + call/BUILD.gn | 2 +- @@ -86,7 +86,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b86cb7278bc4e5571 media/base/media_channel_impl.cc | 9 ---- modules/audio_coding/BUILD.gn | 2 +- modules/audio_device/BUILD.gn | 17 +++++-- - modules/audio_processing/aec3/BUILD.gn | 13 ++---- + modules/audio_processing/aec3/BUILD.gn | 13 +++--- .../aec3/adaptive_fir_filter_avx2.cc | 2 +- .../audio_processing/agc2/rnn_vad/BUILD.gn | 2 +- modules/desktop_capture/BUILD.gn | 29 +----------- @@ -95,10 +95,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b86cb7278bc4e5571 modules/video_capture/BUILD.gn | 11 +---- rtc_base/BUILD.gn | 26 ++++++++++- rtc_base/system/BUILD.gn | 2 +- - test/BUILD.gn | 10 ++++ + test/BUILD.gn | 10 +++++ video/BUILD.gn | 4 +- webrtc.gni | 32 ++++++++----- - 30 files changed, 297 insertions(+), 92 deletions(-) + 30 files changed, 296 insertions(+), 92 deletions(-) create mode 100644 api/rtp_sender_setparameters_callback.cc create mode 100644 api/rtp_sender_setparameters_callback.h @@ -116,7 +116,7 @@ index 1b112b34c0..18cf5d67f7 100644 # TODO(https://bugs.webrtc.org/14437): Remove this section if general # Chromium fix resolves the problem. diff --git a/BUILD.gn b/BUILD.gn -index 3357c2dcdf..db3f2454bc 100644 +index 3357c2dcdf..7131daa82c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -33,7 +33,7 @@ if (is_android) { @@ -151,7 +151,7 @@ index 3357c2dcdf..db3f2454bc 100644 if (!rtc_build_ssl) { config("external_ssl_library") { -@@ -563,6 +569,34 @@ if (!build_with_chromium) { +@@ -563,6 +569,33 @@ if (!build_with_chromium) { "sdk", "video", ] @@ -166,7 +166,6 @@ index 3357c2dcdf..db3f2454bc 100644 + "api/rtc_event_log:rtc_event_log_factory", + "api/task_queue", + "api/task_queue:default_task_queue_factory", -+ "api/test/metrics", + "api/video_codecs:video_decoder_factory_template", + "api/video_codecs:video_decoder_factory_template_dav1d_adapter", + "api/video_codecs:video_decoder_factory_template_libvpx_vp8_adapter", @@ -186,7 +185,7 @@ index 3357c2dcdf..db3f2454bc 100644 if (rtc_include_builtin_audio_codecs) { deps += [ -@@ -575,6 +609,16 @@ if (!build_with_chromium) { +@@ -575,6 +608,16 @@ if (!build_with_chromium) { deps += [ "api/video:video_frame", "api/video:video_rtp_headers", @@ -1014,7 +1013,7 @@ index 39aa39a41c..b26e30e8bb 100644 "/config/external/nspr", "/nsprpub/lib/ds", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index 9e5dfe3c6e..3bd324c4e1 100644 +index 9744edba44..4114dc96e5 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -326,6 +326,7 @@ rtc_library("sample_counter") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0033.patch b/third_party/libwebrtc/moz-patch-stack/s0033.patch @@ -10,7 +10,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/d881b16dd8a6813fe 1 file changed, 6 insertions(+) diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc -index 2320fa5172..ebde0b3865 100644 +index 927c92d0e9..3f33fa406f 100644 --- a/rtc_base/platform_thread.cc +++ b/rtc_base/platform_thread.cc @@ -25,6 +25,8 @@ diff --git a/third_party/libwebrtc/moz-patch-stack/s0034.patch b/third_party/libwebrtc/moz-patch-stack/s0034.patch @@ -20,7 +20,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/58f47eacaf10d12e2 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index db3f2454bc..cd737fefbd 100644 +index 7131daa82c..8ad64af5c8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -440,12 +440,12 @@ config("common_config") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0045.patch b/third_party/libwebrtc/moz-patch-stack/s0045.patch @@ -18,7 +18,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0300b32b7de70fb89 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index cd737fefbd..614d251e40 100644 +index 8ad64af5c8..1896ed1d07 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -224,6 +224,9 @@ config("common_inherited_config") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0053.patch b/third_party/libwebrtc/moz-patch-stack/s0053.patch @@ -29,7 +29,7 @@ index 7db75d5fd3..d0feb5007c 100644 rtc_library("task_queue_test") { visibility = [ "*" ] diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index 3bd324c4e1..9339714ac5 100644 +index 4114dc96e5..3feb70a0d1 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -664,10 +664,14 @@ if (is_mac || is_ios) { diff --git a/third_party/libwebrtc/moz-patch-stack/s0055.patch b/third_party/libwebrtc/moz-patch-stack/s0055.patch @@ -11,10 +11,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b0658888969395dca 2 files changed, 10 insertions(+) diff --git a/BUILD.gn b/BUILD.gn -index 614d251e40..bf346ec180 100644 +index 1896ed1d07..8704f0f34a 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -625,6 +625,10 @@ if (!build_with_chromium) { +@@ -624,6 +624,10 @@ if (!build_with_chromium) { ] } diff --git a/third_party/libwebrtc/moz-patch-stack/s0062.patch b/third_party/libwebrtc/moz-patch-stack/s0062.patch @@ -10,7 +10,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/9e64a965e26c83792 1 file changed, 3 insertions(+) diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc -index ebde0b3865..732181d210 100644 +index 3f33fa406f..1369a108d3 100644 --- a/rtc_base/platform_thread.cc +++ b/rtc_base/platform_thread.cc @@ -58,6 +58,9 @@ bool SetPriority(ThreadPriority priority) { diff --git a/third_party/libwebrtc/moz-patch-stack/s0084.patch b/third_party/libwebrtc/moz-patch-stack/s0084.patch @@ -11,10 +11,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/2185cab977988fd4a 3 files changed, 16 insertions(+) diff --git a/BUILD.gn b/BUILD.gn -index bf346ec180..79bd26b2cf 100644 +index 8704f0f34a..3eab1126bf 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -610,6 +610,7 @@ if (!build_with_chromium) { +@@ -609,6 +609,7 @@ if (!build_with_chromium) { if (build_with_mozilla) { deps += [ diff --git a/third_party/libwebrtc/moz-patch-stack/s0091.patch b/third_party/libwebrtc/moz-patch-stack/s0091.patch @@ -13,7 +13,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/4e7b3c485e549e7e3 1 file changed, 6 insertions(+) diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index 9339714ac5..f04d511cd3 100644 +index 3feb70a0d1..3196d1fd22 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -991,6 +991,12 @@ rtc_library("threading") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0092.patch b/third_party/libwebrtc/moz-patch-stack/s0092.patch @@ -6,28 +6,32 @@ Subject: Bug 1897459 - P2 - for BSD reference null socket server 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 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + 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 1ebe391a2c..8483ca89c7 100644 +index d49c2bba32..521f21f538 100644 --- a/rtc_base/internal/default_socket_server.cc +++ b/rtc_base/internal/default_socket_server.cc -@@ -14,7 +14,7 @@ +@@ -13,12 +13,21 @@ + #include <memory> #include "rtc_base/socket_server.h" - --#if defined(__native_client__) -+#if defined(__native_client__) || defined(WEBRTC_BSD) - #include "rtc_base/null_socket_server.h" - #else ++ ++#if defined(WEBRTC_BSD) ++#include "rtc_base/null_socket_server.h" ++#else #include "rtc_base/physical_socket_server.h" -@@ -23,7 +23,7 @@ ++#endif + namespace webrtc { std::unique_ptr<SocketServer> CreateDefaultSocketServer() { --#if defined(__native_client__) -+#if defined(__native_client__) || defined(WEBRTC_BSD) - return std::unique_ptr<SocketServer>(new NullSocketServer); - #else ++#if defined(WEBRTC_BSD) ++ return std::unique_ptr<SocketServer>(new NullSocketServer); ++#else return std::unique_ptr<SocketServer>(new PhysicalSocketServer); ++#endif + } + + } // namespace webrtc diff --git a/third_party/libwebrtc/moz-patch-stack/s0093.patch b/third_party/libwebrtc/moz-patch-stack/s0093.patch @@ -10,7 +10,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b050c455caa1d24a0 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index 79bd26b2cf..9ebcd0de52 100644 +index 3eab1126bf..550c75bafb 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -280,6 +280,7 @@ config("rtc_prod_config") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0094.patch b/third_party/libwebrtc/moz-patch-stack/s0094.patch @@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/ee2f06666bcc6d22c 1 file changed, 2 insertions(+) diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index f04d511cd3..73191dbadd 100644 +index 3196d1fd22..9d319d5326 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -1654,6 +1654,7 @@ if (!build_with_mozilla) { diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -75,7 +75,7 @@ index cdbd705ec2..4ee826ec58 100644 # The python interpreter to use by default. On Windows, this will look # for vpython3.exe and vpython3.bat. diff --git a/BUILD.gn b/BUILD.gn -index 9ebcd0de52..9a5730ab4c 100644 +index 550c75bafb..28fb57a248 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -21,15 +21,15 @@ @@ -107,7 +107,7 @@ index 9ebcd0de52..9a5730ab4c 100644 defines = [] deps = [ -@@ -853,7 +853,7 @@ rtc_static_library("dcsctp") { +@@ -852,7 +852,7 @@ rtc_static_library("dcsctp") { visibility = [ "//:default" ] sources = [] complete_static_lib = true @@ -116,7 +116,7 @@ index 9ebcd0de52..9a5730ab4c 100644 defines = [] deps = [ "net/dcsctp/public:factory", -@@ -888,7 +888,7 @@ group("poison_software_video_codecs") { +@@ -887,7 +887,7 @@ group("poison_software_video_codecs") { if (!build_with_chromium) { # Write debug logs to gn_logs.txt. # This is also required for Siso builds. @@ -616,7 +616,7 @@ index 5c8e21b516..7e8ac39126 100644 if (rtc_build_libsrtp) { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index 73191dbadd..80e93e96ac 100644 +index 9d319d5326..9653fd651f 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -9,8 +9,8 @@ diff --git a/third_party/libwebrtc/moz-patch-stack/s0106.patch b/third_party/libwebrtc/moz-patch-stack/s0106.patch @@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/90a33b06e51017d25 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn -index 9a5730ab4c..a89b2e964b 100644 +index 28fb57a248..2e315c79c4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -565,6 +565,7 @@ if (!build_with_chromium) { @@ -20,7 +20,7 @@ index 9a5730ab4c..a89b2e964b 100644 "logging:rtc_event_log_api", "media", "modules", -@@ -850,7 +851,7 @@ if (rtc_include_tests && !build_with_chromium) { +@@ -849,7 +850,7 @@ if (rtc_include_tests && !build_with_chromium) { # Build target for standalone dcsctp rtc_static_library("dcsctp") { # Only the root target should depend on this. diff --git a/third_party/libwebrtc/moz-patch-stack/s0108.patch b/third_party/libwebrtc/moz-patch-stack/s0108.patch @@ -16,7 +16,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/4527c41ef71d7683c 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index a89b2e964b..c287c476df 100644 +index 2e315c79c4..174ce0d2f4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -521,6 +521,9 @@ if (!rtc_build_ssl) { @@ -29,7 +29,7 @@ index a89b2e964b..c287c476df 100644 } } -@@ -616,6 +619,7 @@ if (!build_with_chromium) { +@@ -615,6 +618,7 @@ if (!build_with_chromium) { "api/environment:environment_factory", "api/video:video_frame", "api/video:video_rtp_headers", @@ -116,7 +116,7 @@ index b58cb6ba9a..4299453d22 100644 public_configs = [] if (!build_with_chromium) { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index 80e93e96ac..daed1b405e 100644 +index 9653fd651f..82b050a559 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -1533,6 +1533,7 @@ rtc_source_set("ssl_header") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0112.patch b/third_party/libwebrtc/moz-patch-stack/s0112.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/27c29807e6f46562d 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn -index c287c476df..db45ec0415 100644 +index 174ce0d2f4..600993950b 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -616,6 +616,7 @@ if (!build_with_chromium) { +@@ -615,6 +615,7 @@ if (!build_with_chromium) { if (build_with_mozilla) { deps += [ diff --git a/third_party/libwebrtc/moz-patch-stack/s0129.patch b/third_party/libwebrtc/moz-patch-stack/s0129.patch @@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/43de54a6e52daf0a0 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn -index db45ec0415..3bf708728f 100644 +index 600993950b..108b8c6160 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -315,6 +315,17 @@ config("common_config") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0131.patch b/third_party/libwebrtc/moz-patch-stack/s0131.patch @@ -1,21 +0,0 @@ -From: Michael Froman <mfroman@mozilla.com> -Date: Thu, 9 Oct 2025 22:12:00 -0500 -Subject: Bug 1993083 - (fix-33b8c034b1) upstream removed api/test/metrics - -Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/9f914c89ac3a45c4dd1972dd85cfea11acdfae61 ---- - BUILD.gn | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/BUILD.gn b/BUILD.gn -index 3bf708728f..108b8c6160 100644 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -600,7 +600,6 @@ if (!build_with_chromium) { - "api/rtc_event_log:rtc_event_log_factory", - "api/task_queue", - "api/task_queue:default_task_queue_factory", -- "api/test/metrics", - "api/video_codecs:video_decoder_factory_template", - "api/video_codecs:video_decoder_factory_template_dav1d_adapter", - "api/video_codecs:video_decoder_factory_template_libvpx_vp8_adapter", diff --git a/third_party/libwebrtc/rtc_base/BUILD.gn b/third_party/libwebrtc/rtc_base/BUILD.gn @@ -1838,8 +1838,8 @@ rtc_library("rtc_base_tests_utils") { "//third_party/abseil-cpp/absl/algorithm:container", "//third_party/abseil-cpp/absl/base:core_headers", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings:string_view", - "//third_party/abseil-cpp/absl/strings:strings", ] if (is_fuchsia) { deps += [ "//third_party/fuchsia-sdk/sdk/pkg/zx" ] diff --git a/third_party/libwebrtc/rtc_base/async_dns_resolver.cc b/third_party/libwebrtc/rtc_base/async_dns_resolver.cc @@ -43,15 +43,6 @@ namespace webrtc { namespace { -#ifdef __native_client__ -int ResolveHostname(absl::string_view hostname, - int family, - std::vector<IPAddress>* addresses) { - RTC_DCHECK_NOTREACHED(); - RTC_LOG(LS_WARNING) << "ResolveHostname() is not implemented for NaCl"; - return -1; -} -#else // notdef(__native_client__) int ResolveHostname(absl::string_view hostname, int family, std::vector<IPAddress>& addresses) { @@ -94,7 +85,6 @@ int ResolveHostname(absl::string_view hostname, freeaddrinfo(result); return 0; } -#endif // !__native_client__ // Special task posting for Mac/iOS #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) diff --git a/third_party/libwebrtc/rtc_base/byte_order.h b/third_party/libwebrtc/rtc_base/byte_order.h @@ -17,7 +17,7 @@ #include "rtc_base/system/arch.h" // IWYU pragma: keep -#if defined(WEBRTC_POSIX) && !defined(__native_client__) +#if defined(WEBRTC_POSIX) #include <arpa/inet.h> // IWYU pragma: keep #endif @@ -39,7 +39,7 @@ #define le32toh(v) OSSwapLittleToHostInt32(v) #define le64toh(v) OSSwapLittleToHostInt64(v) -#elif defined(WEBRTC_WIN) || defined(__native_client__) +#elif defined(WEBRTC_WIN) #if defined(WEBRTC_WIN) #include <winsock2.h> @@ -62,10 +62,6 @@ #define htobe64(v) _byteswap_uint64(v) #define be64toh(v) _byteswap_uint64(v) #endif // defined(WEBRTC_WIN) -#if defined(__native_client__) -#define htobe64(v) __builtin_bswap64(v) -#define be64toh(v) __builtin_bswap64(v) -#endif // defined(__native_client__) #elif defined(WEBRTC_ARCH_BIG_ENDIAN) #define htobe16(v) (v) @@ -82,10 +78,6 @@ #define htobe64(v) (v) #define be64toh(v) (v) #endif // defined(WEBRTC_WIN) -#if defined(__native_client__) -#define htobe64(v) (v) -#define be64toh(v) (v) -#endif // defined(__native_client__) #else #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined. #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) diff --git a/third_party/libwebrtc/rtc_base/checks.cc b/third_party/libwebrtc/rtc_base/checks.cc @@ -30,8 +30,6 @@ #if defined(WEBRTC_WIN) #define LAST_SYSTEM_ERROR (::GetLastError()) -#elif defined(__native_client__) && __native_client__ -#define LAST_SYSTEM_ERROR (0) #elif defined(WEBRTC_POSIX) #include <cerrno> #define LAST_SYSTEM_ERROR (errno) diff --git a/third_party/libwebrtc/rtc_base/internal/default_socket_server.cc b/third_party/libwebrtc/rtc_base/internal/default_socket_server.cc @@ -14,7 +14,7 @@ #include "rtc_base/socket_server.h" -#if defined(__native_client__) || defined(WEBRTC_BSD) +#if defined(WEBRTC_BSD) #include "rtc_base/null_socket_server.h" #else #include "rtc_base/physical_socket_server.h" @@ -23,7 +23,7 @@ namespace webrtc { std::unique_ptr<SocketServer> CreateDefaultSocketServer() { -#if defined(__native_client__) || defined(WEBRTC_BSD) +#if defined(WEBRTC_BSD) return std::unique_ptr<SocketServer>(new NullSocketServer); #else return std::unique_ptr<SocketServer>(new PhysicalSocketServer); diff --git a/third_party/libwebrtc/rtc_base/ip_address.cc b/third_party/libwebrtc/rtc_base/ip_address.cc @@ -25,8 +25,6 @@ #ifdef OPENBSD #include <netinet/in_systm.h> #endif -#ifndef __native_client__ -#endif #include <netdb.h> #endif diff --git a/third_party/libwebrtc/rtc_base/logging.h b/third_party/libwebrtc/rtc_base/logging.h @@ -681,9 +681,6 @@ inline bool LogCheckLevel(LoggingSeverity sev) { #define RTC_LOG_GLE(sev) RTC_LOG_GLE_EX(sev, static_cast<int>(GetLastError())) #define RTC_LOG_ERR_EX(sev, err) RTC_LOG_GLE_EX(sev, err) #define RTC_LOG_ERR(sev) RTC_LOG_GLE(sev) -#elif defined(__native_client__) && __native_client__ -#define RTC_LOG_ERR_EX(sev, err) RTC_LOG(sev) -#define RTC_LOG_ERR(sev) RTC_LOG(sev) #elif defined(WEBRTC_POSIX) #define RTC_LOG_ERR_EX(sev, err) RTC_LOG_ERRNO_EX(sev, err) #define RTC_LOG_ERR(sev) RTC_LOG_ERRNO(sev) diff --git a/third_party/libwebrtc/rtc_base/net_helpers.cc b/third_party/libwebrtc/rtc_base/net_helpers.cc @@ -17,11 +17,10 @@ #if defined(WEBRTC_WIN) #include <ws2spi.h> #include <ws2tcpip.h> - #endif -#if defined(WEBRTC_POSIX) && !defined(__native_client__) +#if defined(WEBRTC_POSIX) #include <arpa/inet.h> -#endif // defined(WEBRTC_POSIX) && !defined(__native_client__) +#endif // defined(WEBRTC_POSIX) namespace webrtc { diff --git a/third_party/libwebrtc/rtc_base/net_test_helpers.cc b/third_party/libwebrtc/rtc_base/net_test_helpers.cc @@ -18,18 +18,18 @@ #include "rtc_base/win/windows_version.h" #endif -#if defined(WEBRTC_POSIX) && !defined(__native_client__) +#if defined(WEBRTC_POSIX) #if defined(WEBRTC_ANDROID) #include "rtc_base/ifaddrs_android.h" #else #include <ifaddrs.h> #endif -#endif // defined(WEBRTC_POSIX) && !defined(__native_client__) +#endif // defined(WEBRTC_POSIX) namespace webrtc { bool HasIPv4Enabled() { -#if defined(WEBRTC_POSIX) && !defined(__native_client__) +#if defined(WEBRTC_POSIX) bool has_ipv4 = false; struct ifaddrs* ifa; if (getifaddrs(&ifa) < 0) { @@ -88,7 +88,7 @@ bool HasIPv6Enabled() { } } return false; -#elif defined(WEBRTC_POSIX) && !defined(__native_client__) +#elif defined(WEBRTC_POSIX) bool has_ipv6 = false; struct ifaddrs* ifa; if (getifaddrs(&ifa) < 0) { @@ -106,4 +106,5 @@ bool HasIPv6Enabled() { return true; #endif } + } // namespace webrtc diff --git a/third_party/libwebrtc/rtc_base/network.cc b/third_party/libwebrtc/rtc_base/network.cc @@ -55,7 +55,7 @@ #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/string_utils.h" #include "rtc_base/win32.h" -#elif !defined(__native_client__) +#else #include "rtc_base/ifaddrs_converter.h" #endif // IWYU pragma: end_keep @@ -158,7 +158,6 @@ uint16_t ComputeNetworkCostByType(int type, } } -#if !defined(__native_client__) bool IsIgnoredIPv6(bool allow_mac_based_ipv6, const InterfaceAddress& ip) { if (ip.family() != AF_INET6) { return false; @@ -186,7 +185,6 @@ bool IsIgnoredIPv6(bool allow_mac_based_ipv6, const InterfaceAddress& ip) { return false; } -#endif // !defined(__native_client__) // Note: consider changing to const Network* as arguments // if/when considering other changes that should not trigger @@ -573,17 +571,7 @@ void BasicNetworkManager::OnNetworksChanged() { UpdateNetworksOnce(); } -#if defined(__native_client__) - -bool BasicNetworkManager::CreateNetworks( - bool include_ignored, - std::vector<std::unique_ptr<Network>>* networks) const { - RTC_DCHECK_NOTREACHED(); - RTC_LOG(LS_WARNING) << "BasicNetworkManager doesn't work on NaCl yet"; - return false; -} - -#elif defined(WEBRTC_POSIX) +#if defined(WEBRTC_POSIX) NetworkMonitorInterface::InterfaceInfo BasicNetworkManager::GetInterfaceInfo( struct ifaddrs* cursor) const { if (cursor->ifa_flags & IFF_LOOPBACK) { diff --git a/third_party/libwebrtc/rtc_base/physical_socket_server.cc b/third_party/libwebrtc/rtc_base/physical_socket_server.cc @@ -69,8 +69,6 @@ #if defined(WEBRTC_WIN) #define LAST_SYSTEM_ERROR (::GetLastError()) -#elif defined(__native_client__) && __native_client__ -#define LAST_SYSTEM_ERROR (0) #elif defined(WEBRTC_POSIX) #define LAST_SYSTEM_ERROR (errno) #endif // WEBRTC_WIN @@ -80,7 +78,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX -#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__) +#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) #if defined(WEBRTC_LINUX) #include <linux/sockios.h> #endif @@ -703,7 +701,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) { *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; -#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__) +#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; #elif defined(WEBRTC_POSIX) diff --git a/third_party/libwebrtc/rtc_base/platform_thread.cc b/third_party/libwebrtc/rtc_base/platform_thread.cc @@ -49,7 +49,7 @@ bool SetPriority(ThreadPriority priority) { #if defined(WEBRTC_WIN) return SetThreadPriority(GetCurrentThread(), Win32PriorityFromThreadPriority(priority)) != FALSE; -#elif defined(__native_client__) || defined(WEBRTC_FUCHSIA) || \ +#elif defined(WEBRTC_FUCHSIA) || \ (defined(__EMSCRIPTEN__) && !defined(__EMSCRIPTEN_PTHREADS__)) // Setting thread priorities is not supported in NaCl, Fuchsia or Emscripten // without pthreads. diff --git a/third_party/libwebrtc/rtc_base/socket_address.cc b/third_party/libwebrtc/rtc_base/socket_address.cc @@ -20,8 +20,6 @@ #if defined(OPENBSD) #include <netinet/in_systm.h> #endif -#if !defined(__native_client__) -#endif #endif #include "absl/strings/string_view.h"