zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename RtpPacketHistory::PacketState::payload_size -> packet_size

Browse Source 
To reflect what this value actually contain.

BUG: webrtc:10325
Change-Id: Ic3c5efbd16157bfae1a2749df17051f105720997
Reviewed-on: https://webrtc-review.googlesource.com/c/123500
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26787}
This commit is contained in:
Per Kjellander
2019-02-20 13:14:34 +01:00
committed by Commit Bot
parent 1b801e0e1a
commit 252725d986
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rtp_rtcp/source/rtp_packet_history.cc
View File

@ -315,7 +315,7 @@ RtpPacketHistory::PacketState RtpPacketHistory::StoredPacketToPacketState(
state.send_time_ms = stored_packet.send_time_ms; state.send_time_ms = stored_packet.send_time_ms;
state.capture_time_ms = stored_packet.packet->capture_time_ms(); state.capture_time_ms = stored_packet.packet->capture_time_ms();
state.ssrc = stored_packet.packet->Ssrc(); 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; state.times_retransmitted = stored_packet.times_retransmitted;
return state; return state;
} }

2
modules/rtp_rtcp/source/rtp_packet_history.h
View File

@ -44,7 +44,7 @@ class RtpPacketHistory {
absl::optional<int64_t> send_time_ms; absl::optional<int64_t> send_time_ms;
int64_t capture_time_ms = 0; int64_t capture_time_ms = 0;
uint32_t ssrc = 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. // Number of times RE-transmitted, ie not including the first transmission.
size_t times_retransmitted = 0; size_t times_retransmitted = 0;
}; };

4
modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
View File

@ -191,7 +191,7 @@ TEST_F(RtpPacketHistoryTest, PacketStateIsCorrect) {
EXPECT_EQ(state->send_time_ms, fake_clock_.TimeInMilliseconds()); EXPECT_EQ(state->send_time_ms, fake_clock_.TimeInMilliseconds());
EXPECT_EQ(state->capture_time_ms, fake_clock_.TimeInMilliseconds()); EXPECT_EQ(state->capture_time_ms, fake_clock_.TimeInMilliseconds());
EXPECT_EQ(state->ssrc, kSsrc); 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); EXPECT_EQ(state->times_retransmitted, 0u);
fake_clock_.AdvanceTimeMilliseconds(1); fake_clock_.AdvanceTimeMilliseconds(1);
@ -228,7 +228,7 @@ TEST_F(RtpPacketHistoryTest, MinResendTimeWithPacer) {
absl::optional<RtpPacketHistory::PacketState> packet_state = absl::optional<RtpPacketHistory::PacketState> packet_state =
hist_.GetPacketState(kStartSeqNum); hist_.GetPacketState(kStartSeqNum);
EXPECT_TRUE(packet_state); 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); EXPECT_EQ(capture_time_ms, packet_state->capture_time_ms);
// Retransmission was allowed, next send it from pacer. // Retransmission was allowed, next send it from pacer.

4
modules/rtp_rtcp/source/rtp_sender.cc
View File

@ -443,7 +443,7 @@ int32_t RTPSender::ReSendPacket(uint16_t packet_id) {
return 0; return 0;
} }
const int32_t packet_size = static_cast<int32_t>(stored_packet->payload_size); const int32_t packet_size = static_cast<int32_t>(stored_packet->packet_size);
// Skip retransmission rate check if not configured. // Skip retransmission rate check if not configured.
if (retransmission_rate_limiter_) { if (retransmission_rate_limiter_) {
@ -462,7 +462,7 @@ int32_t RTPSender::ReSendPacket(uint16_t packet_id) {
paced_sender_->InsertPacket( paced_sender_->InsertPacket(
RtpPacketSender::kNormalPriority, stored_packet->ssrc, RtpPacketSender::kNormalPriority, stored_packet->ssrc,
stored_packet->rtp_sequence_number, corrected_capture_tims_ms, stored_packet->rtp_sequence_number, corrected_capture_tims_ms,
stored_packet->payload_size, true); stored_packet->packet_size, true);
return packet_size; return packet_size;
} }