commit f733bcd005ace3843b9ccae7a93f836db583c545 parent cb867d5a618117c7b73716d917e938b36dfc4029 Author: Dan Baker <dbaker@mozilla.com> Date: Mon, 27 Oct 2025 12:20:05 -0600 Bug 1995393 - Vendor libwebrtc from a3fbc13447 Upstream commit: https://webrtc.googlesource.com/src/+/a3fbc134478baefbd6c4bc0590d7b3c2420f2403 Delete RtcpRttStats::LastProcessedRtt as no longer used It was used by the legacy RtpRtcp module, but is not needed for the new one Bug: webrtc:42224904 Change-Id: I8007835e8561072da836cd93803406f55b22b59c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/405521 Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45427} Diffstat:
6 files changed, 7 insertions(+), 25 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 /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T18:16:31.261057+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T18:19:48.086610+00:00. # base of lastest vendoring -c530e64f66 +a3fbc13447 diff --git a/third_party/libwebrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/third_party/libwebrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -269,11 +269,8 @@ class StreamFeedbackProvider { class RtcpRttStats { public: + virtual ~RtcpRttStats() = default; virtual void OnRttUpdate(int64_t rtt) = 0; - - virtual int64_t LastProcessedRtt() const = 0; - - virtual ~RtcpRttStats() {} }; struct RtpPacketCounter { diff --git a/third_party/libwebrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h b/third_party/libwebrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h @@ -21,7 +21,6 @@ namespace webrtc { class MockRtcpRttStats : public RtcpRttStats { public: MOCK_METHOD(void, OnRttUpdate, (int64_t rtt), (override)); - MOCK_METHOD(int64_t, LastProcessedRtt, (), (const, override)); }; } // namespace webrtc #endif // MODULES_RTP_RTCP_MOCKS_MOCK_RTCP_RTT_STATS_H_ diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc @@ -102,7 +102,9 @@ class RtcpRttStatsTestImpl : public RtcpRttStats { ~RtcpRttStatsTestImpl() override = default; void OnRttUpdate(int64_t rtt_ms) override { rtt_ms_ = rtt_ms; } - int64_t LastProcessedRtt() const override { return rtt_ms_; } + int64_t LastProcessedRtt() const { return rtt_ms_; } + + private: int64_t rtt_ms_; }; diff --git a/third_party/libwebrtc/moz-patch-stack/s0035.patch b/third_party/libwebrtc/moz-patch-stack/s0035.patch @@ -168,7 +168,7 @@ index c69ec1a674..b07f08eddf 100644 // Transport for outgoing packets (RTCP). diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h -index cb4decc834..664600fd76 100644 +index 6a8b521be0..85ce11278e 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -182,6 +182,14 @@ class NetworkLinkRtcpObserver { diff --git a/third_party/libwebrtc/video/call_stats2.h b/third_party/libwebrtc/video/call_stats2.h @@ -19,7 +19,6 @@ #include "api/units/time_delta.h" #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/checks.h" #include "rtc_base/task_utils/repeating_task.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" @@ -43,10 +42,6 @@ class CallStats { void EnsureStarted(); // Expose an RtcpRttStats implementation without inheriting from RtcpRttStats. - // That allows us to separate the threading model of how RtcpRttStats is - // used (mostly on a process thread) and how CallStats is used (mostly on - // the TQ/worker thread). Since for both cases, there is a LastProcessedRtt() - // method, this separation allows us to not need a lock for either. RtcpRttStats* AsRtcpRttStats() { return &rtcp_rtt_stats_impl_; } // Registers/deregisters a new observer to receive statistics updates. @@ -54,8 +49,6 @@ class CallStats { void RegisterStatsObserver(CallStatsObserver* observer); void DeregisterStatsObserver(CallStatsObserver* observer); - // Expose `LastProcessedRtt()` from RtcpRttStats to the public interface, as - // it is the part of the API that is needed by direct users of CallStats. int64_t LastProcessedRtt() const; // Exposed for tests to test histogram support. @@ -92,15 +85,6 @@ class CallStats { owner_->OnRttUpdate(rtt); } - int64_t LastProcessedRtt() const override { - // This call path shouldn't be used anymore. This impl is only for - // propagating the rtt from the RtpRtcp module, which does not call - // LastProcessedRtt(). Down the line we should consider removing - // LastProcessedRtt() and use the interface for event notifications only. - RTC_DCHECK_NOTREACHED() << "Legacy call path"; - return 0; - } - CallStats* const owner_; } rtcp_rtt_stats_impl_{this};