Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: net/quic/quic_sent_packet_manager.cc

Issue 1785853002: Remove is_fec_packet from TransmissionInfo and SerializedPacket. No functional change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@116411121
Patch Set: Merge from 116555910 Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_protocol.cc ('k') | net/quic/quic_sent_packet_manager_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_sent_packet_manager.cc
diff --git a/net/quic/quic_sent_packet_manager.cc b/net/quic/quic_sent_packet_manager.cc
index 4eef7ba1f85d6f7bcced642b491d8cee11c52f45..e2ca91ee42807dc6a30d55df27cad7c5f31c24aa 100644
--- a/net/quic/quic_sent_packet_manager.cc
+++ b/net/quic/quic_sent_packet_manager.cc
@@ -339,9 +339,6 @@ void QuicSentPacketManager::RetransmitUnackedPackets(
(retransmission_type == ALL_UNACKED_RETRANSMISSION ||
it->encryption_level == ENCRYPTION_INITIAL)) {
MarkForRetransmission(packet_number, retransmission_type);
- } else if (it->is_fec_packet) {
- // Remove FEC packets from the packet map, since we can't retransmit them.
- unacked_packets_.RemoveFromInFlight(packet_number);
}
}
}
@@ -561,16 +558,10 @@ bool QuicSentPacketManager::OnPacketSent(
--pending_timer_transmission_count_;
}
- // Only track packets as in flight that the send algorithm wants us to track.
- // Since FEC packets should also be counted towards the congestion window,
- // consider them as retransmittable for the purposes of congestion control.
- HasRetransmittableData has_congestion_controlled_data =
- serialized_packet->is_fec_packet ? HAS_RETRANSMITTABLE_DATA
- : has_retransmittable_data;
// TODO(ianswett): Remove sent_time, because it's unused.
const bool in_flight = send_algorithm_->OnPacketSent(
sent_time, unacked_packets_.bytes_in_flight(), packet_number,
- serialized_packet->encrypted_length, has_congestion_controlled_data);
+ serialized_packet->encrypted_length, has_retransmittable_data);
unacked_packets_.AddSentPacket(serialized_packet, original_packet_number,
transmission_type, sent_time, in_flight);
« no previous file with comments | « net/quic/quic_protocol.cc ('k') | net/quic/quic_sent_packet_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698