Index: webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc |
index 860f193d0c323d31c13c21ffe7ca8c5d09e492f1..4a90a0e1ad5456b75da47a4d80c84d74f843c656 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc |
@@ -530,8 +530,7 @@ TEST_P(RtpSenderTestWithoutPacer, WritesTimestampToTimingExtension) { |
TEST_P(RtpSenderTest, TrafficSmoothingWithExtensions) { |
EXPECT_CALL(mock_paced_sender_, InsertPacket(RtpPacketSender::kNormalPriority, |
kSsrc, kSeqNum, _, _, _)); |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)); |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)); |
rtp_sender_->SetStorePacketsStatus(true, 10); |
EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension( |
@@ -575,8 +574,7 @@ TEST_P(RtpSenderTest, TrafficSmoothingWithExtensions) { |
TEST_P(RtpSenderTest, TrafficSmoothingRetransmits) { |
EXPECT_CALL(mock_paced_sender_, InsertPacket(RtpPacketSender::kNormalPriority, |
kSsrc, kSeqNum, _, _, _)); |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)); |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)); |
rtp_sender_->SetStorePacketsStatus(true, 10); |
EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension( |
@@ -629,9 +627,7 @@ TEST_P(RtpSenderTest, SendPadding) { |
// Make all (non-padding) packets go to send queue. |
EXPECT_CALL(mock_paced_sender_, InsertPacket(RtpPacketSender::kNormalPriority, |
kSsrc, kSeqNum, _, _, _)); |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)) |
- .Times(1 + 4 + 1); |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)).Times(1 + 4 + 1); |
uint16_t seq_num = kSeqNum; |
uint32_t timestamp = kTimestamp; |
@@ -830,8 +826,7 @@ TEST_P(RtpSenderTest, SendRedundantPayloads) { |
EXPECT_CALL(mock_paced_sender_, |
InsertPacket(RtpPacketSender::kNormalPriority, kSsrc, _, _, _, _)) |
.Times(kNumPayloadSizes); |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)) |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)) |
.Times(kNumPayloadSizes); |
// Send 10 packets of increasing size. |
@@ -844,8 +839,7 @@ TEST_P(RtpSenderTest, SendRedundantPayloads) { |
fake_clock_.AdvanceTimeMilliseconds(33); |
} |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)) |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)) |
.Times(::testing::AtLeast(4)); |
// The amount of padding to send it too small to send a payload packet. |
@@ -941,9 +935,7 @@ TEST_P(RtpSenderTest, SendFlexfecPackets) { |
kFlexfecSsrc, _, _, _, false)) |
.WillOnce(testing::SaveArg<2>(&flexfec_seq_num)); |
SendGenericPayload(); |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)) |
- .Times(2); |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)).Times(2); |
EXPECT_TRUE(rtp_sender_->TimeToSendPacket(kMediaSsrc, kSeqNum, |
fake_clock_.TimeInMilliseconds(), |
false, PacedPacketInfo())); |
@@ -1018,9 +1010,7 @@ TEST_P(RtpSenderTest, NoFlexfecForTimingFrames) { |
sizeof(kPayloadData), nullptr, &video_header, nullptr, |
kDefaultExpectedRetransmissionTimeMs)); |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)) |
- .Times(1); |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)).Times(1); |
EXPECT_TRUE(rtp_sender_->TimeToSendPacket(kMediaSsrc, kSeqNum, |
fake_clock_.TimeInMilliseconds(), |
false, PacedPacketInfo())); |
@@ -1044,9 +1034,7 @@ TEST_P(RtpSenderTest, NoFlexfecForTimingFrames) { |
kPayloadData, sizeof(kPayloadData), nullptr, &video_header, nullptr, |
kDefaultExpectedRetransmissionTimeMs)); |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)) |
- .Times(2); |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)).Times(2); |
EXPECT_TRUE(rtp_sender_->TimeToSendPacket(kMediaSsrc, kSeqNum + 1, |
fake_clock_.TimeInMilliseconds(), |
false, PacedPacketInfo())); |
@@ -1092,9 +1080,7 @@ TEST_P(RtpSenderTestWithoutPacer, SendFlexfecPackets) { |
params.fec_mask_type = kFecMaskRandom; |
rtp_sender_->SetFecParameters(params, params); |
- EXPECT_CALL(mock_rtc_event_log_, |
- LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _)) |
- .Times(2); |
+ EXPECT_CALL(mock_rtc_event_log_, LogOutgoingRtpHeader(_, _)).Times(2); |
SendGenericPayload(); |
ASSERT_EQ(2, transport_.packets_sent()); |
const RtpPacketReceived& media_packet = transport_.sent_packets_[0]; |