| 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 a6a886be94b023e11361b0cef66dc086dad37dd6..57863c89118b76265ffd86c68ab7aecaa36d43e3 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
|
| @@ -425,7 +425,7 @@ TEST_F(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(
|
| @@ -470,7 +470,7 @@ TEST_F(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(
|
| @@ -524,7 +524,7 @@ TEST_F(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;
|
| @@ -725,7 +725,7 @@ TEST_F(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.
|
| @@ -739,7 +739,7 @@ TEST_F(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.
|
| @@ -834,7 +834,7 @@ TEST_F(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(), false, 0));
|
| @@ -879,7 +879,7 @@ TEST_F(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());
|
|
|