Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2288)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc

Issue 1748403002: Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated RTP/RTCP module to use setter methods instead of passing the event log pointer in the const… Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a0d614590984544156e6e4b90de8b7435290176e..8e991bd1d315ebe19e8179ccdc77588008187276 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -144,8 +144,9 @@ class RtpSenderTest : public ::testing::Test {
rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
pacer ? &mock_paced_sender_ : nullptr,
&seq_num_allocator_, nullptr, nullptr,
- nullptr, nullptr, &mock_rtc_event_log_));
+ nullptr, nullptr));
rtp_sender_->SetSequenceNumber(kSeqNum);
+ rtp_sender_->SetRtcEventLog(&mock_rtc_event_log_);
}
SimulatedClock fake_clock_;
@@ -953,11 +954,12 @@ TEST_F(RtpSenderTest, SendPadding) {
TEST_F(RtpSenderTest, SendRedundantPayloads) {
MockTransport transport;
- rtp_sender_.reset(new RTPSender(
- false, &fake_clock_, &transport, nullptr, &mock_paced_sender_, nullptr,
- nullptr, nullptr, nullptr, nullptr, &mock_rtc_event_log_));
+ rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport, nullptr,
+ &mock_paced_sender_, nullptr, nullptr,
+ nullptr, nullptr, nullptr));
rtp_sender_->SetSequenceNumber(kSeqNum);
rtp_sender_->SetRtxPayloadType(kRtxPayload, kPayload);
+ rtp_sender_->SetRtcEventLog(&mock_rtc_event_log_);
uint16_t seq_num = kSeqNum;
rtp_sender_->SetStorePacketsStatus(true, 10);
@@ -1098,7 +1100,7 @@ TEST_F(RtpSenderTest, FrameCountCallbacks) {
rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
&mock_paced_sender_, nullptr, nullptr,
- nullptr, &callback, nullptr, nullptr));
+ nullptr, &callback, nullptr));
char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC";
const uint8_t payload_type = 127;
@@ -1154,7 +1156,7 @@ TEST_F(RtpSenderTest, BitrateCallbacks) {
} callback;
rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
nullptr, nullptr, nullptr, &callback, nullptr,
- nullptr, nullptr));
+ nullptr));
// Simulate kNumPackets sent with kPacketInterval ms intervals.
const uint32_t kNumPackets = 15;
@@ -1207,7 +1209,7 @@ class RtpSenderAudioTest : public RtpSenderTest {
payload_ = kAudioPayload;
rtp_sender_.reset(new RTPSender(true, &fake_clock_, &transport_, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr,
- nullptr, nullptr));
+ nullptr));
rtp_sender_->SetSequenceNumber(kSeqNum);
}
};

Powered by Google App Engine
This is Rietveld 408576698