From 06bb4649dc60598f2bfb32604d7d6f7d2dfe3b3e Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Wed, 4 Aug 2021 11:33:51 +0200 Subject: [PATCH] packethistory: s/kMaxPaddingtHistory/kMaxPaddingHistory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=None Change-Id: I554ff068c2350b9f14c12d935d7bfdd466dc5186 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227351 Reviewed-by: Erik Språng Commit-Queue: Philipp Hancke Cr-Commit-Position: refs/heads/master@{#34642} --- modules/rtp_rtcp/source/rtp_packet_history.cc | 4 ++-- modules/rtp_rtcp/source/rtp_packet_history.h | 2 +- modules/rtp_rtcp/source/rtp_packet_history_unittest.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_packet_history.cc b/modules/rtp_rtcp/source/rtp_packet_history.cc index 5089933051..317b808efb 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.cc +++ b/modules/rtp_rtcp/source/rtp_packet_history.cc @@ -24,7 +24,7 @@ namespace webrtc { constexpr size_t RtpPacketHistory::kMaxCapacity; -constexpr size_t RtpPacketHistory::kMaxPaddingtHistory; +constexpr size_t RtpPacketHistory::kMaxPaddingHistory; constexpr int64_t RtpPacketHistory::kMinPacketDurationMs; constexpr int RtpPacketHistory::kMinPacketDurationRtt; constexpr int RtpPacketHistory::kPacketCullingDelayFactor; @@ -160,7 +160,7 @@ void RtpPacketHistory::PutRtpPacket(std::unique_ptr packet, StoredPacket(std::move(packet), send_time_ms, packets_inserted_++); if (enable_padding_prio_) { - if (padding_priority_.size() >= kMaxPaddingtHistory - 1) { + if (padding_priority_.size() >= kMaxPaddingHistory - 1) { padding_priority_.erase(std::prev(padding_priority_.end())); } auto prio_it = padding_priority_.insert(&packet_history_[packet_index]); diff --git a/modules/rtp_rtcp/source/rtp_packet_history.h b/modules/rtp_rtcp/source/rtp_packet_history.h index 4a2bf91bd7..44adc8c873 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.h +++ b/modules/rtp_rtcp/source/rtp_packet_history.h @@ -54,7 +54,7 @@ class RtpPacketHistory { // Maximum number of packets we ever allow in the history. static constexpr size_t kMaxCapacity = 9600; // Maximum number of entries in prioritized queue of padding packets. - static constexpr size_t kMaxPaddingtHistory = 63; + static constexpr size_t kMaxPaddingHistory = 63; // Don't remove packets within max(1000ms, 3x RTT). static constexpr int64_t kMinPacketDurationMs = 1000; static constexpr int kMinPacketDurationRtt = 3; diff --git a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc index 2331724397..90e984a78c 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc @@ -300,7 +300,7 @@ TEST_P(RtpPacketHistoryTest, RemovesLowestPrioPaddingWhenAtMaxCapacity) { // Tests the absolute upper bound on number of packets in the prioritized // set of potential padding packets. - const size_t kMaxNumPackets = RtpPacketHistory::kMaxPaddingtHistory; + const size_t kMaxNumPackets = RtpPacketHistory::kMaxPaddingHistory; hist_.SetStorePacketsStatus(StorageMode::kStoreAndCull, kMaxNumPackets * 2); hist_.SetRtt(1);