diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor index 2911c1c5c377..e31648df135d 100644 --- 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-03-07T22:26:04.421669+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-03-07T22:26:58.460825+00:00. # base of lastest vendoring -8e14ab0310 +9494d02c03 diff --git a/third_party/libwebrtc/modules/video_coding/utility/quality_scaler.h b/third_party/libwebrtc/modules/video_coding/utility/quality_scaler.h index eeb878a0c693..9b6aec670b12 100644 --- a/third_party/libwebrtc/modules/video_coding/utility/quality_scaler.h +++ b/third_party/libwebrtc/modules/video_coding/utility/quality_scaler.h @@ -88,10 +88,9 @@ class QualityScaler { VideoEncoder::QpThresholds thresholds_ RTC_GUARDED_BY(&task_checker_); const int64_t sampling_period_ms_; bool fast_rampup_ RTC_GUARDED_BY(&task_checker_); - rtc::MovingAverage average_qp_ RTC_GUARDED_BY(&task_checker_); - rtc::MovingAverage framedrop_percent_media_opt_ - RTC_GUARDED_BY(&task_checker_); - rtc::MovingAverage framedrop_percent_all_ RTC_GUARDED_BY(&task_checker_); + MovingAverage average_qp_ RTC_GUARDED_BY(&task_checker_); + MovingAverage framedrop_percent_media_opt_ RTC_GUARDED_BY(&task_checker_); + MovingAverage framedrop_percent_all_ RTC_GUARDED_BY(&task_checker_); // Used by QualityScalingExperiment. const bool experiment_enabled_; diff --git a/third_party/libwebrtc/rtc_base/numerics/moving_average.cc b/third_party/libwebrtc/rtc_base/numerics/moving_average.cc index f91926f59721..17c5d9cd9afa 100644 --- a/third_party/libwebrtc/rtc_base/numerics/moving_average.cc +++ b/third_party/libwebrtc/rtc_base/numerics/moving_average.cc @@ -17,7 +17,7 @@ #include "rtc_base/checks.h" -namespace rtc { +namespace webrtc { MovingAverage::MovingAverage(size_t window_size) : history_(window_size, 0) { // Limit window size to avoid overflow. @@ -60,4 +60,4 @@ void MovingAverage::Reset() { size_t MovingAverage::Size() const { return std::min(count_, history_.size()); } -} // namespace rtc +} // namespace webrtc diff --git a/third_party/libwebrtc/rtc_base/numerics/moving_average.h b/third_party/libwebrtc/rtc_base/numerics/moving_average.h index f9aa8ee02115..7d9a70463038 100644 --- a/third_party/libwebrtc/rtc_base/numerics/moving_average.h +++ b/third_party/libwebrtc/rtc_base/numerics/moving_average.h @@ -17,7 +17,7 @@ #include #include -namespace rtc { +namespace webrtc { // Calculates average over fixed size window. If there are less than window // size elements, calculates average of all inserted so far elements. @@ -61,5 +61,11 @@ class MovingAverage { std::vector history_; }; +} // namespace webrtc + +// Re-export symbols from the webrtc namespace for backwards compatibility. +// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. +namespace rtc { +using ::webrtc::MovingAverage; } // namespace rtc #endif // RTC_BASE_NUMERICS_MOVING_AVERAGE_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/moving_average_unittest.cc b/third_party/libwebrtc/rtc_base/numerics/moving_average_unittest.cc index 163a7785d284..5b691e7476b2 100644 --- a/third_party/libwebrtc/rtc_base/numerics/moving_average_unittest.cc +++ b/third_party/libwebrtc/rtc_base/numerics/moving_average_unittest.cc @@ -17,21 +17,21 @@ namespace test { TEST(MovingAverageTest, EmptyAverage) { - rtc::MovingAverage moving_average(1); + webrtc::MovingAverage moving_average(1); EXPECT_EQ(0u, moving_average.Size()); EXPECT_EQ(std::nullopt, moving_average.GetAverageRoundedDown()); } // Test single value. TEST(MovingAverageTest, OneElement) { - rtc::MovingAverage moving_average(1); + webrtc::MovingAverage moving_average(1); moving_average.AddSample(3); EXPECT_EQ(1u, moving_average.Size()); EXPECT_EQ(3, *moving_average.GetAverageRoundedDown()); } TEST(MovingAverageTest, GetAverage) { - rtc::MovingAverage moving_average(1024); + webrtc::MovingAverage moving_average(1024); moving_average.AddSample(1); moving_average.AddSample(1); moving_average.AddSample(3); @@ -41,7 +41,7 @@ TEST(MovingAverageTest, GetAverage) { } TEST(MovingAverageTest, GetAverageRoundedDownRounds) { - rtc::MovingAverage moving_average(1024); + webrtc::MovingAverage moving_average(1024); moving_average.AddSample(1); moving_average.AddSample(2); moving_average.AddSample(2); @@ -50,7 +50,7 @@ TEST(MovingAverageTest, GetAverageRoundedDownRounds) { } TEST(MovingAverageTest, GetAverageRoundedToClosestRounds) { - rtc::MovingAverage moving_average(1024); + webrtc::MovingAverage moving_average(1024); moving_average.AddSample(1); moving_average.AddSample(2); moving_average.AddSample(2); @@ -59,7 +59,7 @@ TEST(MovingAverageTest, GetAverageRoundedToClosestRounds) { } TEST(MovingAverageTest, Reset) { - rtc::MovingAverage moving_average(5); + webrtc::MovingAverage moving_average(5); moving_average.AddSample(1); EXPECT_EQ(1, *moving_average.GetAverageRoundedDown()); EXPECT_EQ(1, *moving_average.GetAverageRoundedToClosest()); @@ -73,7 +73,7 @@ TEST(MovingAverageTest, Reset) { } TEST(MovingAverageTest, ManySamples) { - rtc::MovingAverage moving_average(10); + webrtc::MovingAverage moving_average(10); for (int i = 1; i < 11; i++) { moving_average.AddSample(i); } diff --git a/third_party/libwebrtc/video/video_quality_observer2.h b/third_party/libwebrtc/video/video_quality_observer2.h index 87dff9b434c9..e9b66c5dfdb5 100644 --- a/third_party/libwebrtc/video/video_quality_observer2.h +++ b/third_party/libwebrtc/video/video_quality_observer2.h @@ -72,7 +72,7 @@ class VideoQualityObserver { bool is_last_frame_blocky_; // Decoded timestamp of the last delayed frame. int64_t last_unfreeze_time_ms_; - rtc::MovingAverage render_interframe_delays_; + MovingAverage render_interframe_delays_; double sum_squared_interframe_delays_secs_; // An inter-frame delay is counted as a freeze if it's significantly longer // than average inter-frame delay.