commit 194a594b94fde7fbda0bccc102c52f14e065401c parent eecf8c31fdf717b0bddf411d09e80410ab1f0edc Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 8 Oct 2025 18:47:40 -0500 Bug 1993083 - Vendor libwebrtc from 00b714e1fd Upstream commit: https://webrtc.googlesource.com/src/+/00b714e1fd222aa30c19ac5bea538ffe62bc22d2 IWYU modules/ partially and remove legacy ECN alias using find modules -name "*.h" -o -name "*.cc" | xargs tools_webrtc/iwyu/apply-include-cleaner followed by a revert of platform-specific modules which will be done separately followed by tools_webrtc/gn_check_autofix.py -C out/Default/ followed by git cl format Then manually remove the backward compat rtc_base/network/ecn_marking.h and update the dependencies. Bug: webrtc:42226242 No-Iwyu: platform-specific code in socket_server Change-Id: Ifb950b7c28ecc644c4de3b53b8dade9dc36f271c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/397920 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@meta.com> Cr-Commit-Position: refs/heads/main@{#45079} Diffstat:
37 files changed, 78 insertions(+), 103 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-08T23:46:19.019350+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T23:47:26.996185+00:00. # base of lastest vendoring -e610d18231 +00b714e1fd diff --git a/third_party/libwebrtc/modules/async_audio_processing/BUILD.gn b/third_party/libwebrtc/modules/async_audio_processing/BUILD.gn @@ -17,6 +17,7 @@ rtc_library("async_audio_processing") { public = [ "async_audio_processing.h" ] deps = [ + "../../api:ref_count", "../../api:scoped_refptr", "../../api:sequence_checker", "../../api/audio:audio_frame_api", diff --git a/third_party/libwebrtc/modules/async_audio_processing/async_audio_processing.cc b/third_party/libwebrtc/modules/async_audio_processing/async_audio_processing.cc @@ -10,11 +10,12 @@ */ #include "modules/async_audio_processing/async_audio_processing.h" +#include <memory> #include <utility> #include "api/audio/audio_frame.h" +#include "api/audio/audio_frame_processor.h" #include "api/task_queue/task_queue_factory.h" -#include "rtc_base/checks.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/async_audio_processing/async_audio_processing.h b/third_party/libwebrtc/modules/async_audio_processing/async_audio_processing.h @@ -14,8 +14,8 @@ #include <memory> #include "api/audio/audio_frame_processor.h" +#include "api/ref_count.h" #include "api/task_queue/task_queue_base.h" -#include "rtc_base/ref_count.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/BUILD.gn b/third_party/libwebrtc/modules/remote_bitrate_estimator/BUILD.gn @@ -104,6 +104,7 @@ rtc_library("congestion_control_feedback_generator") { "../../api:field_trials_view", "../../api:sequence_checker", "../../api/environment", + "../../api/transport:ecn_marking", "../../api/units:data_rate", "../../api/units:data_size", "../../api/units:time_delta", @@ -112,7 +113,6 @@ rtc_library("congestion_control_feedback_generator") { "../../rtc_base:logging", "../../rtc_base:rtc_numerics", "../../rtc_base/experiments:field_trial_parser", - "../../rtc_base/network:ecn_marking", "../rtp_rtcp:ntp_time_util", "../rtp_rtcp:rtp_rtcp_format", "//third_party/abseil-cpp/absl/algorithm:container", @@ -174,6 +174,7 @@ if (rtc_include_tests) { "../../api:rtp_headers", "../../api/environment:environment_factory", "../../api/transport:bandwidth_usage", + "../../api/transport:ecn_marking", "../../api/transport:mock_network_control", "../../api/transport:network_control", "../../api/units:data_rate", @@ -184,7 +185,6 @@ if (rtc_include_tests) { "../../rtc_base:checks", "../../rtc_base:logging", "../../rtc_base:random", - "../../rtc_base/network:ecn_marking", "../../system_wrappers", "../../test:create_test_field_trials", "../../test:fileutils", diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_unittest.cc b/third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_unittest.cc @@ -17,6 +17,7 @@ #include <vector> #include "api/environment/environment_factory.h" +#include "api/transport/ecn_marking.h" #include "api/units/data_rate.h" #include "api/units/data_size.h" #include "api/units/time_delta.h" @@ -26,7 +27,6 @@ #include "modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "rtc_base/buffer.h" -#include "rtc_base/network/ecn_marking.h" #include "system_wrappers/include/clock.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_tracker.cc b/third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_tracker.cc @@ -16,13 +16,13 @@ #include <vector> #include "absl/algorithm/container.h" +#include "api/transport/ecn_marking.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/network/ecn_marking.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_tracker.h b/third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_tracker.h @@ -14,10 +14,10 @@ #include <optional> #include <vector> +#include "api/transport/ecn_marking.h" #include "api/units/timestamp.h" #include "modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" -#include "rtc_base/network/ecn_marking.h" #include "rtc_base/numerics/sequence_number_unwrapper.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_tracker_unittest.cc b/third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_tracker_unittest.cc @@ -13,11 +13,11 @@ #include <cstdint> #include <vector> +#include "api/transport/ecn_marking.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" -#include "rtc_base/network/ecn_marking.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/third_party/libwebrtc/modules/rtp_rtcp/BUILD.gn b/third_party/libwebrtc/modules/rtp_rtcp/BUILD.gn @@ -119,6 +119,7 @@ rtc_library("rtp_rtcp_format") { "../../api:rtp_parameters", "../../api:scoped_refptr", "../../api/audio_codecs:audio_codecs_api", + "../../api/transport:ecn_marking", "../../api/transport:network_control", "../../api/transport/rtp:corruption_detection_message", "../../api/transport/rtp:dependency_descriptor", @@ -139,7 +140,6 @@ rtc_library("rtp_rtcp_format") { "../../rtc_base:safe_compare", "../../rtc_base:safe_conversions", "../../rtc_base:stringutils", - "../../rtc_base/network:ecn_marking", "../../system_wrappers", "../video_coding:codec_globals_headers", "//third_party/abseil-cpp/absl/algorithm:container", @@ -710,6 +710,7 @@ if (rtc_include_tests) { "../../api/environment:environment_factory", "../../api/rtc_event_log", "../../api/task_queue", + "../../api/transport:ecn_marking", "../../api/transport:network_control", "../../api/transport/rtp:corruption_detection_message", "../../api/transport/rtp:dependency_descriptor", @@ -751,7 +752,6 @@ if (rtc_include_tests) { "../../rtc_base:task_queue_for_test", "../../rtc_base:threading", "../../rtc_base:timeutils", - "../../rtc_base/network:ecn_marking", "../../system_wrappers", "../../system_wrappers:metrics", "../../test:create_test_field_trials", diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.cc @@ -17,12 +17,12 @@ #include <vector> #include "api/array_view.h" +#include "api/transport/ecn_marking.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "rtc_base/checks.h" -#include "rtc_base/network/ecn_marking.h" namespace webrtc { namespace rtcp { diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h b/third_party/libwebrtc/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h @@ -15,10 +15,10 @@ #include <vector> #include "api/array_view.h" +#include "api/transport/ecn_marking.h" #include "api/units/time_delta.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" -#include "rtc_base/network/ecn_marking.h" namespace webrtc { namespace rtcp { diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback_unittest.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback_unittest.cc @@ -17,12 +17,12 @@ #include "api/array_view.h" #include "api/function_view.h" +#include "api/transport/ecn_marking.h" #include "api/units/time_delta.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "rtc_base/buffer.h" #include "rtc_base/logging.h" -#include "rtc_base/network/ecn_marking.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_packet_received.h b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_packet_received.h @@ -17,9 +17,9 @@ #include "api/ref_counted_base.h" #include "api/rtp_headers.h" #include "api/scoped_refptr.h" +#include "api/transport/ecn_marking.h" #include "api/units/timestamp.h" #include "modules/rtp_rtcp/source/rtp_packet.h" -#include "rtc_base/network/ecn_marking.h" namespace webrtc { // Class to hold rtp packet with metadata for receiver side. diff --git a/third_party/libwebrtc/modules/video_coding/BUILD.gn b/third_party/libwebrtc/modules/video_coding/BUILD.gn @@ -556,6 +556,9 @@ rtc_library("mock_libvpx_interface") { ":webrtc_libvpx_interface", "../../test:test_support", ] + if (rtc_build_libvpx) { + deps += [ rtc_libvpx_dir ] + } } # This target includes the internal SW codec. diff --git a/third_party/libwebrtc/modules/video_coding/codecs/interface/libvpx_interface.cc b/third_party/libwebrtc/modules/video_coding/codecs/interface/libvpx_interface.cc @@ -14,11 +14,11 @@ #include <memory> #include "rtc_base/checks.h" -#include "vpx/vp8cx.h" -#include "vpx/vpx_codec.h" -#include "vpx/vpx_encoder.h" -#include "vpx/vpx_ext_ratectrl.h" -#include "vpx/vpx_image.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_ext_ratectrl.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_image.h" namespace webrtc { namespace { diff --git a/third_party/libwebrtc/modules/video_coding/codecs/interface/libvpx_interface.h b/third_party/libwebrtc/modules/video_coding/codecs/interface/libvpx_interface.h @@ -15,11 +15,11 @@ #include <memory> -#include "vpx/vp8cx.h" -#include "vpx/vpx_codec.h" -#include "vpx/vpx_encoder.h" -#include "vpx/vpx_ext_ratectrl.h" -#include "vpx/vpx_image.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_ext_ratectrl.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_image.h" namespace webrtc { diff --git a/third_party/libwebrtc/modules/video_coding/codecs/interface/mock_libvpx_interface.h b/third_party/libwebrtc/modules/video_coding/codecs/interface/mock_libvpx_interface.h @@ -15,11 +15,11 @@ #include "modules/video_coding/codecs/interface/libvpx_interface.h" #include "test/gmock.h" -#include "vpx/vp8cx.h" -#include "vpx/vpx_codec.h" -#include "vpx/vpx_encoder.h" -#include "vpx/vpx_ext_ratectrl.h" -#include "vpx/vpx_image.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_ext_ratectrl.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_image.h" namespace webrtc { 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 216b91fcfd..c94b9ffb6c 100644 +index 7bb1856610..95bec39d7a 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -448,6 +448,12 @@ rtc_library("logging") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0009.patch b/third_party/libwebrtc/moz-patch-stack/s0009.patch @@ -115,10 +115,10 @@ index 56aba5ee63..0923e7aca7 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 0844b7fa66..57dc31e558 100644 +index fa03f59cdc..798034a846 100644 --- a/rtc_base/physical_socket_server.cc +++ b/rtc_base/physical_socket_server.cc -@@ -85,7 +85,10 @@ typedef void* SockOptArg; +@@ -84,7 +84,10 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -130,7 +130,7 @@ index 0844b7fa66..57dc31e558 100644 int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -707,7 +710,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) { +@@ -706,7 +709,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) { *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; 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 57dc31e558..2355a193ab 100644 +index 798034a846..68b3a97f77 100644 --- a/rtc_base/physical_socket_server.cc +++ b/rtc_base/physical_socket_server.cc -@@ -1557,7 +1557,7 @@ bool PhysicalSocketServer::WaitSelect(int cmsWait, bool process_io) { +@@ -1556,7 +1556,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/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -1008,7 +1008,7 @@ index 058b86bce4..2f7b5b5333 100644 "/config/external/nspr", "/nsprpub/lib/ds", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index c94b9ffb6c..d9cc228c4c 100644 +index 95bec39d7a..6aed005071 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -324,6 +324,7 @@ rtc_library("sample_counter") { @@ -1037,7 +1037,7 @@ index c94b9ffb6c..d9cc228c4c 100644 if (rtc_build_json) { deps += [ "//third_party/jsoncpp" ] } else { -@@ -1178,6 +1182,7 @@ if (!build_with_chromium) { +@@ -1177,6 +1181,7 @@ if (!build_with_chromium) { } rtc_library("network") { @@ -1045,7 +1045,7 @@ index c94b9ffb6c..d9cc228c4c 100644 visibility = [ "*" ] sources = [ "network.cc", -@@ -1219,16 +1224,20 @@ rtc_library("network") { +@@ -1218,16 +1223,20 @@ rtc_library("network") { deps += [ ":win32" ] } } @@ -1066,7 +1066,7 @@ index c94b9ffb6c..d9cc228c4c 100644 visibility = [ "*" ] sources = [ "net_helper.cc", -@@ -1239,8 +1248,10 @@ rtc_library("net_helper") { +@@ -1238,8 +1247,10 @@ rtc_library("net_helper") { "//third_party/abseil-cpp/absl/strings:string_view", ] } @@ -1077,7 +1077,7 @@ index c94b9ffb6c..d9cc228c4c 100644 visibility = [ "*" ] sources = [ "socket_adapters.cc", -@@ -1261,6 +1272,7 @@ rtc_library("socket_adapters") { +@@ -1260,6 +1271,7 @@ rtc_library("socket_adapters") { "//third_party/abseil-cpp/absl/strings:string_view", ] } @@ -1085,7 +1085,7 @@ index c94b9ffb6c..d9cc228c4c 100644 rtc_library("network_route") { sources = [ -@@ -1275,6 +1287,7 @@ rtc_library("network_route") { +@@ -1274,6 +1286,7 @@ rtc_library("network_route") { } rtc_library("async_tcp_socket") { @@ -1093,7 +1093,7 @@ index c94b9ffb6c..d9cc228c4c 100644 sources = [ "async_tcp_socket.cc", "async_tcp_socket.h", -@@ -1294,8 +1307,10 @@ rtc_library("async_tcp_socket") { +@@ -1293,8 +1306,10 @@ rtc_library("async_tcp_socket") { "network:sent_packet", ] } @@ -1104,7 +1104,7 @@ index c94b9ffb6c..d9cc228c4c 100644 visibility = [ "*" ] sources = [ "async_udp_socket.cc", -@@ -1319,8 +1334,10 @@ rtc_library("async_udp_socket") { +@@ -1318,8 +1333,10 @@ rtc_library("async_udp_socket") { "system:no_unique_address", ] } @@ -1115,7 +1115,7 @@ index c94b9ffb6c..d9cc228c4c 100644 visibility = [ "*" ] sources = [ "async_packet_socket.cc", -@@ -1343,6 +1360,7 @@ rtc_library("async_packet_socket") { +@@ -1342,6 +1359,7 @@ rtc_library("async_packet_socket") { "//third_party/abseil-cpp/absl/functional:any_invocable", ] } @@ -1123,7 +1123,7 @@ index c94b9ffb6c..d9cc228c4c 100644 if (rtc_include_tests) { rtc_library("async_packet_socket_unittest") { -@@ -1416,6 +1434,7 @@ rtc_library("data_rate_limiter") { +@@ -1415,6 +1433,7 @@ rtc_library("data_rate_limiter") { } rtc_library("unique_id_generator") { @@ -1131,7 +1131,7 @@ index c94b9ffb6c..d9cc228c4c 100644 sources = [ "unique_id_generator.cc", "unique_id_generator.h", -@@ -1433,6 +1452,7 @@ rtc_library("unique_id_generator") { +@@ -1432,6 +1451,7 @@ rtc_library("unique_id_generator") { "//third_party/abseil-cpp/absl/strings:string_view", ] } @@ -1139,7 +1139,7 @@ index c94b9ffb6c..d9cc228c4c 100644 rtc_library("crc32") { sources = [ -@@ -1464,6 +1484,7 @@ rtc_library("stream") { +@@ -1463,6 +1483,7 @@ rtc_library("stream") { } rtc_library("rtc_certificate_generator") { @@ -1147,7 +1147,7 @@ index c94b9ffb6c..d9cc228c4c 100644 visibility = [ "*" ] sources = [ "rtc_certificate_generator.cc", -@@ -1478,6 +1499,7 @@ rtc_library("rtc_certificate_generator") { +@@ -1477,6 +1498,7 @@ rtc_library("rtc_certificate_generator") { "//third_party/abseil-cpp/absl/functional:any_invocable", ] } @@ -1155,7 +1155,7 @@ index c94b9ffb6c..d9cc228c4c 100644 rtc_source_set("ssl_header") { visibility = [ "*" ] -@@ -1534,6 +1556,7 @@ rtc_library("crypto_random") { +@@ -1533,6 +1555,7 @@ rtc_library("crypto_random") { } rtc_library("ssl") { @@ -1163,7 +1163,7 @@ index c94b9ffb6c..d9cc228c4c 100644 visibility = [ "*" ] sources = [ "openssl_key_pair.cc", -@@ -1606,6 +1629,7 @@ rtc_library("ssl") { +@@ -1605,6 +1628,7 @@ rtc_library("ssl") { deps += [ ":win32" ] } } @@ -1171,7 +1171,7 @@ index c94b9ffb6c..d9cc228c4c 100644 rtc_library("ssl_adapter") { visibility = [ "*" ] -@@ -2358,7 +2382,7 @@ if (rtc_include_tests) { +@@ -2356,7 +2380,7 @@ if (rtc_include_tests) { } } 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 c1c917abb2..de937ccf7e 100644 rtc_library("task_queue_test") { visibility = [ "*" ] diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index d9cc228c4c..c0722653fe 100644 +index 6aed005071..4c7d6f0c97 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -663,10 +663,14 @@ if (is_mac || is_ios) { 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 c0722653fe..5e56385efd 100644 +index 4c7d6f0c97..aebf6048dc 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -990,6 +990,12 @@ rtc_library("threading") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0094.patch b/third_party/libwebrtc/moz-patch-stack/s0094.patch @@ -9,10 +9,10 @@ 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 5e56385efd..b6cf8625ca 100644 +index aebf6048dc..d13eabadbb 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn -@@ -1642,6 +1642,7 @@ if (!build_with_mozilla) { +@@ -1641,6 +1641,7 @@ if (!build_with_mozilla) { } rtc_library("ssl_adapter") { @@ -20,7 +20,7 @@ index 5e56385efd..b6cf8625ca 100644 visibility = [ "*" ] sources = [ "openssl_adapter.cc", -@@ -1690,6 +1691,7 @@ rtc_library("ssl_adapter") { +@@ -1689,6 +1690,7 @@ rtc_library("ssl_adapter") { configs += [ "..:external_ssl_library" ] } } diff --git a/third_party/libwebrtc/moz-patch-stack/s0101.patch b/third_party/libwebrtc/moz-patch-stack/s0101.patch @@ -39,7 +39,7 @@ index d249da5fd9..a992a032c5 100644 group("media") { diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn -index 606c1161bc..16290b35f7 100644 +index b93ed8c707..f79625d651 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -7,7 +7,7 @@ diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -588,7 +588,7 @@ index a693604389..72972d18e1 100644 import("../../webrtc.gni") diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn -index 16290b35f7..71ba90f630 100644 +index f79625d651..fe09ff6f5b 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -6,7 +6,7 @@ @@ -601,7 +601,7 @@ index 16290b35f7..71ba90f630 100644 import("../../webrtc.gni") diff --git a/pc/BUILD.gn b/pc/BUILD.gn -index 4b98a026ca..ca03ab219a 100644 +index 1af9f2efb0..0086730835 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -30,8 +30,8 @@ @@ -616,7 +616,7 @@ index 4b98a026ca..ca03ab219a 100644 if (rtc_build_libsrtp) { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index b6cf8625ca..206c90bff5 100644 +index d13eabadbb..16565eb595 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -9,8 +9,8 @@ @@ -630,7 +630,7 @@ index b6cf8625ca..206c90bff5 100644 } rtc_source_set("protobuf_utils") { -@@ -1879,8 +1879,8 @@ rtc_library("base64") { +@@ -1878,8 +1878,8 @@ rtc_library("base64") { } if (rtc_rusty_base64) { diff --git a/third_party/libwebrtc/moz-patch-stack/s0108.patch b/third_party/libwebrtc/moz-patch-stack/s0108.patch @@ -116,10 +116,10 @@ index 6f2dc22e00..e3ee0fe861 100644 public_configs = [] if (!build_with_chromium) { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index 206c90bff5..8d869bc92e 100644 +index 16565eb595..9947a80e7b 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn -@@ -1521,6 +1521,7 @@ rtc_source_set("ssl_header") { +@@ -1520,6 +1520,7 @@ rtc_source_set("ssl_header") { } rtc_library("digest") { @@ -127,7 +127,7 @@ index 206c90bff5..8d869bc92e 100644 visibility = [ "*" ] sources = [ "message_digest.cc", -@@ -1542,8 +1543,10 @@ rtc_library("digest") { +@@ -1541,8 +1542,10 @@ rtc_library("digest") { configs += [ "..:external_ssl_library" ] } } @@ -138,7 +138,7 @@ index 206c90bff5..8d869bc92e 100644 visibility = [ "*" ] sources = [ "crypto_random.cc", -@@ -1564,6 +1567,7 @@ rtc_library("crypto_random") { +@@ -1563,6 +1566,7 @@ rtc_library("crypto_random") { configs += [ "..:external_ssl_library" ] } } diff --git a/third_party/libwebrtc/p2p/BUILD.gn b/third_party/libwebrtc/p2p/BUILD.gn @@ -309,7 +309,6 @@ rtc_library("dtls_transport") { "../rtc_base:stringutils", "../rtc_base:threading", "../rtc_base:timeutils", - "../rtc_base/network:ecn_marking", "../rtc_base/network:received_packet", "../rtc_base/network:sent_packet", "../rtc_base/system:no_unique_address", @@ -1291,7 +1290,6 @@ if (rtc_include_tests) { "../rtc_base:testclient", "../rtc_base:threading", "../rtc_base:timeutils", - "../rtc_base/network:ecn_marking", "../rtc_base/network:received_packet", "../rtc_base/network:sent_packet", "../rtc_base/third_party/sigslot", diff --git a/third_party/libwebrtc/pc/BUILD.gn b/third_party/libwebrtc/pc/BUILD.gn @@ -574,6 +574,7 @@ rtc_library("rtp_transport") { "../api:field_trials_view", "../api/task_queue", "../api/task_queue:pending_task_safety_flag", + "../api/transport:ecn_marking", "../api/units:timestamp", "../call:rtp_receiver", "../call:video_receive_stream_api", @@ -588,7 +589,6 @@ rtc_library("rtp_transport") { "../rtc_base:network_route", "../rtc_base:socket", "../rtc_base/containers:flat_set", - "../rtc_base/network:ecn_marking", "../rtc_base/network:received_packet", "../rtc_base/network:sent_packet", ] diff --git a/third_party/libwebrtc/pc/rtp_transport.cc b/third_party/libwebrtc/pc/rtp_transport.cc @@ -20,6 +20,7 @@ #include "api/array_view.h" #include "api/task_queue/pending_task_safety_flag.h" #include "api/task_queue/task_queue_base.h" +#include "api/transport/ecn_marking.h" #include "api/units/timestamp.h" #include "call/rtp_demuxer.h" #include "media/base/rtp_utils.h" @@ -27,11 +28,11 @@ #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "p2p/base/packet_transport_internal.h" #include "pc/session_description.h" +#include "rtc_base/async_packet_socket.h" #include "rtc_base/checks.h" #include "rtc_base/containers/flat_set.h" #include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/logging.h" -#include "rtc_base/network/ecn_marking.h" #include "rtc_base/network/received_packet.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/network_route.h" diff --git a/third_party/libwebrtc/pc/rtp_transport.h b/third_party/libwebrtc/pc/rtp_transport.h @@ -19,6 +19,7 @@ #include "api/field_trials_view.h" #include "api/task_queue/pending_task_safety_flag.h" +#include "api/transport/ecn_marking.h" #include "api/units/timestamp.h" #include "call/rtp_demuxer.h" #include "call/video_receive_stream.h" @@ -29,7 +30,6 @@ #include "rtc_base/async_packet_socket.h" #include "rtc_base/containers/flat_set.h" #include "rtc_base/copy_on_write_buffer.h" -#include "rtc_base/network/ecn_marking.h" #include "rtc_base/network/received_packet.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/network_route.h" diff --git a/third_party/libwebrtc/rtc_base/BUILD.gn b/third_party/libwebrtc/rtc_base/BUILD.gn @@ -1027,7 +1027,6 @@ rtc_library("threading") { "../api/transport:ecn_marking", "../api/units:time_delta", "../api/units:timestamp", - "./network:ecn_marking", "synchronization:mutex", "system:no_unique_address", "system:rtc_export", @@ -1079,8 +1078,8 @@ rtc_library("socket") { ":ip_address", ":net_helpers", ":socket_address", + "../api/transport:ecn_marking", "../api/units:timestamp", - "./network:ecn_marking", "system:rtc_export", "third_party/sigslot", ] @@ -2053,7 +2052,6 @@ if (rtc_include_tests) { "../test:test_main", "../test:test_support", "../test:wait_until", - "network:ecn_marking", "system:file_wrapper", "third_party/sigslot", "//testing/gtest", diff --git a/third_party/libwebrtc/rtc_base/network/BUILD.gn b/third_party/libwebrtc/rtc_base/network/BUILD.gn @@ -16,12 +16,6 @@ rtc_library("sent_packet") { deps = [ "../system:rtc_export" ] } -rtc_source_set("ecn_marking") { - visibility = [ "*" ] - sources = [ "ecn_marking.h" ] - deps = [ "../../api/transport:ecn_marking" ] -} - rtc_library("received_packet") { visibility = [ "*" ] sources = [ @@ -29,7 +23,6 @@ rtc_library("received_packet") { "received_packet.h", ] deps = [ - ":ecn_marking", "..:checks", "..:socket_address", "../../api:array_view", diff --git a/third_party/libwebrtc/rtc_base/network/ecn_marking.h b/third_party/libwebrtc/rtc_base/network/ecn_marking.h @@ -1,17 +0,0 @@ -/* - * Copyright 2024 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -#ifndef RTC_BASE_NETWORK_ECN_MARKING_H_ -#define RTC_BASE_NETWORK_ECN_MARKING_H_ - -// // TODO: bugs.webrtc.org/42225697 - delete this file. -#include "api/transport/ecn_marking.h" - - -#endif // RTC_BASE_NETWORK_ECN_MARKING_H_ diff --git a/third_party/libwebrtc/rtc_base/physical_socket_server.cc b/third_party/libwebrtc/rtc_base/physical_socket_server.cc @@ -60,7 +60,6 @@ #include "rtc_base/event.h" #include "rtc_base/ip_address.h" #include "rtc_base/logging.h" -#include "rtc_base/network/ecn_marking.h" #include "rtc_base/network_monitor.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/time_utils.h" diff --git a/third_party/libwebrtc/rtc_base/socket.h b/third_party/libwebrtc/rtc_base/socket.h @@ -25,12 +25,10 @@ #endif // IWYU pragma: end_exports +#include "api/transport/ecn_marking.h" #include "api/units/timestamp.h" #include "rtc_base/buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/ip_address.h" -#include "rtc_base/net_helpers.h" -#include "rtc_base/network/ecn_marking.h" #include "rtc_base/socket_address.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h"