diff --git a/modules/rtp_rtcp/source/rtp_packet_history.cc b/modules/rtp_rtcp/source/rtp_packet_history.cc index 8c1c8ebbbf..ac39e22391 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.cc +++ b/modules/rtp_rtcp/source/rtp_packet_history.cc @@ -315,7 +315,7 @@ RtpPacketHistory::PacketState RtpPacketHistory::StoredPacketToPacketState( state.send_time_ms = stored_packet.send_time_ms; state.capture_time_ms = stored_packet.packet->capture_time_ms(); state.ssrc = stored_packet.packet->Ssrc(); - state.payload_size = stored_packet.packet->size(); + state.packet_size = stored_packet.packet->size(); state.times_retransmitted = stored_packet.times_retransmitted; return state; } diff --git a/modules/rtp_rtcp/source/rtp_packet_history.h b/modules/rtp_rtcp/source/rtp_packet_history.h index c5b6e4d262..5e6463ba30 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.h +++ b/modules/rtp_rtcp/source/rtp_packet_history.h @@ -44,7 +44,7 @@ class RtpPacketHistory { absl::optional send_time_ms; int64_t capture_time_ms = 0; uint32_t ssrc = 0; - size_t payload_size = 0; + size_t packet_size = 0; // Number of times RE-transmitted, ie not including the first transmission. size_t times_retransmitted = 0; }; diff --git a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc index 140434cbbd..afa158c0ce 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc @@ -191,7 +191,7 @@ TEST_F(RtpPacketHistoryTest, PacketStateIsCorrect) { EXPECT_EQ(state->send_time_ms, fake_clock_.TimeInMilliseconds()); EXPECT_EQ(state->capture_time_ms, fake_clock_.TimeInMilliseconds()); EXPECT_EQ(state->ssrc, kSsrc); - EXPECT_EQ(state->payload_size, packet_size); + EXPECT_EQ(state->packet_size, packet_size); EXPECT_EQ(state->times_retransmitted, 0u); fake_clock_.AdvanceTimeMilliseconds(1); @@ -228,7 +228,7 @@ TEST_F(RtpPacketHistoryTest, MinResendTimeWithPacer) { absl::optional packet_state = hist_.GetPacketState(kStartSeqNum); EXPECT_TRUE(packet_state); - EXPECT_EQ(len, packet_state->payload_size); + EXPECT_EQ(len, packet_state->packet_size); EXPECT_EQ(capture_time_ms, packet_state->capture_time_ms); // Retransmission was allowed, next send it from pacer. diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index ce10848138..c11034bf99 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -443,7 +443,7 @@ int32_t RTPSender::ReSendPacket(uint16_t packet_id) { return 0; } - const int32_t packet_size = static_cast(stored_packet->payload_size); + const int32_t packet_size = static_cast(stored_packet->packet_size); // Skip retransmission rate check if not configured. if (retransmission_rate_limiter_) { @@ -462,7 +462,7 @@ int32_t RTPSender::ReSendPacket(uint16_t packet_id) { paced_sender_->InsertPacket( RtpPacketSender::kNormalPriority, stored_packet->ssrc, stored_packet->rtp_sequence_number, corrected_capture_tims_ms, - stored_packet->payload_size, true); + stored_packet->packet_size, true); return packet_size; }