| 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 70f27d06516add6218882b57af00748e7cd024b4..af9832229fddd1712e6728764ec2e914dcbd99ee 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
|
| @@ -464,7 +464,7 @@ TEST_P(RtpSenderTest, TrafficSmoothingWithExtensions) {
|
| EXPECT_CALL(mock_paced_sender_, InsertPacket(RtpPacketSender::kNormalPriority,
|
| kSsrc, kSeqNum, _, _, _));
|
| EXPECT_CALL(mock_rtc_event_log_,
|
| - LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _, _));
|
| + LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _));
|
|
|
| rtp_sender_->SetStorePacketsStatus(true, 10);
|
| EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
|
| @@ -509,7 +509,7 @@ TEST_P(RtpSenderTest, TrafficSmoothingRetransmits) {
|
| EXPECT_CALL(mock_paced_sender_, InsertPacket(RtpPacketSender::kNormalPriority,
|
| kSsrc, kSeqNum, _, _, _));
|
| EXPECT_CALL(mock_rtc_event_log_,
|
| - LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _, _));
|
| + LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _));
|
|
|
| rtp_sender_->SetStorePacketsStatus(true, 10);
|
| EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
|
| @@ -563,7 +563,7 @@ TEST_P(RtpSenderTest, SendPadding) {
|
| EXPECT_CALL(mock_paced_sender_, InsertPacket(RtpPacketSender::kNormalPriority,
|
| kSsrc, kSeqNum, _, _, _));
|
| EXPECT_CALL(mock_rtc_event_log_,
|
| - LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _, _))
|
| + LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _))
|
| .Times(1 + 4 + 1);
|
|
|
| uint16_t seq_num = kSeqNum;
|
| @@ -764,7 +764,7 @@ TEST_P(RtpSenderTest, SendRedundantPayloads) {
|
| InsertPacket(RtpPacketSender::kNormalPriority, kSsrc, _, _, _, _))
|
| .Times(kNumPayloadSizes);
|
| EXPECT_CALL(mock_rtc_event_log_,
|
| - LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _, _))
|
| + LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _))
|
| .Times(kNumPayloadSizes);
|
|
|
| // Send 10 packets of increasing size.
|
| @@ -778,7 +778,7 @@ TEST_P(RtpSenderTest, SendRedundantPayloads) {
|
| }
|
|
|
| EXPECT_CALL(mock_rtc_event_log_,
|
| - LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _, _))
|
| + LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _))
|
| .Times(::testing::AtLeast(4));
|
|
|
| // The amount of padding to send it too small to send a payload packet.
|
| @@ -875,7 +875,7 @@ TEST_P(RtpSenderTest, SendFlexfecPackets) {
|
| .WillOnce(testing::SaveArg<2>(&flexfec_seq_num));
|
| SendGenericPayload();
|
| EXPECT_CALL(mock_rtc_event_log_,
|
| - LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _, _))
|
| + LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _))
|
| .Times(2);
|
| EXPECT_TRUE(rtp_sender_->TimeToSendPacket(kMediaSsrc, kSeqNum,
|
| fake_clock_.TimeInMilliseconds(),
|
| @@ -923,7 +923,7 @@ TEST_P(RtpSenderTestWithoutPacer, SendFlexfecPackets) {
|
| rtp_sender_->SetFecParameters(params, params);
|
|
|
| EXPECT_CALL(mock_rtc_event_log_,
|
| - LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _, _))
|
| + LogRtpHeader(PacketDirection::kOutgoingPacket, _, _, _))
|
| .Times(2);
|
| SendGenericPayload();
|
| ASSERT_EQ(2, transport_.packets_sent());
|
|
|