commit 52701b0a9d6a14d4d52cd35f308704cce733f88b
author haoyuewang <haoyuewang@google.com> Thu Oct 15 13:29:17 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 15 13:29:52 2020 -0700
tree 5a90986eb60e51658718b8714fcb0e23aac37506
parent c921f8dd9136d9f26dd60fa3363000d75c396c06

Merge kAckDecimationDelay & kAckDelayShift.

PiperOrigin-RevId: 337371059
Change-Id: I6136e8f268749c134e8f4b1135558c8f49f4438c

quic/core/quic_sent_packet_manager.cc

diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index 106393b..b98f65c 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -59,11 +59,6 @@
 // losses.
 static const uint32_t kConservativeUnpacedBurst = 2;
 
-// TODO(haoyuewang) Unify this constant and kAckDecimationDelay in
-// quic_received_packet_manager.cc.
-// Ack delay as (RTT >> kAckDelayShift).
-static const int kAckDelayShift = 2;
-
 }  // namespace
 
 #define ENDPOINT                                                         \
@@ -731,7 +726,7 @@
   QUIC_RELOADABLE_FLAG_COUNT(quic_can_send_ack_frequency);
   frame.packet_tolerance = kMaxRetransmittablePacketsBeforeAck;
   auto rtt = rtt_stats_.MinOrInitialRtt();
-  frame.max_ack_delay = rtt >> kAckDelayShift;
+  frame.max_ack_delay = rtt * kAckDecimationDelay;
   frame.max_ack_delay = std::max(frame.max_ack_delay, peer_min_ack_delay_);
 
   return frame;