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

Unified Diff: net/quic/quic_packet_creator.cc

Issue 1782143003: Remove FEC code from receive path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@115997404
Patch Set: 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_packet_creator.h ('k') | net/quic/quic_packet_creator_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_packet_creator.cc
diff --git a/net/quic/quic_packet_creator.cc b/net/quic/quic_packet_creator.cc
index 56e88bfdedbb56eec6f8866ed907201b84bf26ff..dd40b2f5856e85596f0f1f8d24948818ce3d38c7 100644
--- a/net/quic/quic_packet_creator.cc
+++ b/net/quic/quic_packet_creator.cc
@@ -169,8 +169,7 @@ bool QuicPacketCreator::ConsumeData(QuicStreamId id,
bool QuicPacketCreator::HasRoomForStreamFrame(QuicStreamId id,
QuicStreamOffset offset) {
- return BytesFree() >
- QuicFramer::GetMinStreamFrameSize(id, offset, true, NOT_IN_FEC_GROUP);
+ return BytesFree() > QuicFramer::GetMinStreamFrameSize(id, offset, true);
}
// static
@@ -179,13 +178,11 @@ size_t QuicPacketCreator::StreamFramePacketOverhead(
bool include_version,
bool include_path_id,
QuicPacketNumberLength packet_number_length,
- QuicStreamOffset offset,
- InFecGroup is_in_fec_group) {
+ QuicStreamOffset offset) {
return GetPacketHeaderSize(connection_id_length, include_version,
- include_path_id, packet_number_length,
- is_in_fec_group) +
+ include_path_id, packet_number_length) +
// Assumes this is a stream with a single lone packet.
- QuicFramer::GetMinStreamFrameSize(1u, offset, true, is_in_fec_group);
+ QuicFramer::GetMinStreamFrameSize(1u, offset, true);
}
size_t QuicPacketCreator::CreateStreamFrame(QuicStreamId id,
@@ -195,16 +192,16 @@ size_t QuicPacketCreator::CreateStreamFrame(QuicStreamId id,
bool fin,
QuicFrame* frame) {
DCHECK_GT(max_packet_length_,
- StreamFramePacketOverhead(
- connection_id_length_, kIncludeVersion, kIncludePathId,
- PACKET_6BYTE_PACKET_NUMBER, offset, IN_FEC_GROUP));
+ StreamFramePacketOverhead(connection_id_length_, kIncludeVersion,
+ kIncludePathId,
+ PACKET_6BYTE_PACKET_NUMBER, offset));
MaybeUpdatePacketNumberLength();
LOG_IF(DFATAL, !HasRoomForStreamFrame(id, offset))
<< "No room for Stream frame, BytesFree: " << BytesFree()
<< " MinStreamFrameSize: "
- << QuicFramer::GetMinStreamFrameSize(id, offset, true, NOT_IN_FEC_GROUP);
+ << QuicFramer::GetMinStreamFrameSize(id, offset, true);
if (iov_offset == iov.total_length) {
QUIC_BUG_IF(!fin) << "Creating a stream frame with no data or fin.";
@@ -215,7 +212,7 @@ size_t QuicPacketCreator::CreateStreamFrame(QuicStreamId id,
const size_t data_size = iov.total_length - iov_offset;
size_t min_frame_size = QuicFramer::GetMinStreamFrameSize(
- id, offset, /* last_frame_in_packet= */ true, NOT_IN_FEC_GROUP);
+ id, offset, /* last_frame_in_packet= */ true);
size_t bytes_consumed = min<size_t>(BytesFree() - min_frame_size, data_size);
bool set_fin = fin && bytes_consumed == data_size; // Last frame.
@@ -392,7 +389,7 @@ size_t QuicPacketCreator::PacketSize() {
packet_.packet_number_length = next_packet_number_length_;
packet_size_ = GetPacketHeaderSize(
connection_id_length_, send_version_in_packet_, send_path_id_in_packet_,
- packet_.packet_number_length, NOT_IN_FEC_GROUP);
+ packet_.packet_number_length);
return packet_size_;
}
@@ -528,7 +525,7 @@ bool QuicPacketCreator::AddFrame(const QuicFrame& frame,
MaybeUpdatePacketNumberLength();
size_t frame_len = framer_->GetSerializedFrameLength(
- frame, BytesFree(), queued_frames_.empty(), true, NOT_IN_FEC_GROUP,
+ frame, BytesFree(), queued_frames_.empty(), true,
packet_.packet_number_length);
if (frame_len == 0) {
// Current open packet is full.
« no previous file with comments | « net/quic/quic_packet_creator.h ('k') | net/quic/quic_packet_creator_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698