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

Remove usage of RtpRtcp::SetSSRC() in RtpRtcpImplTest

Browse Source 
Bug: webrtc:10774
Change-Id: Ifaf82776d547ed1c2ca99c27c1deda4060d18ec2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/152164
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29115}
This commit is contained in:
Erik Språng
2019-09-09 17:25:52 +02:00
committed by Commit Bot
parent 0987273e1d
commit 4d7dac6d3b
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
View File

@ -99,28 +99,23 @@ class SendTransport : public Transport {
class RtpRtcpModule : public RtcpPacketTypeCounterObserver { class RtpRtcpModule : public RtcpPacketTypeCounterObserver {
public: public:
explicit RtpRtcpModule(SimulatedClock* clock) RtpRtcpModule(SimulatedClock* clock, bool is_sender)
: receive_statistics_(ReceiveStatistics::Create(clock)), : is_sender_(is_sender),
remote_ssrc_(0), receive_statistics_(ReceiveStatistics::Create(clock)),
clock_(clock) { clock_(clock) {
CreateModuleImpl(); CreateModuleImpl();
transport_.SimulateNetworkDelay(kOneWayNetworkDelayMs, clock); transport_.SimulateNetworkDelay(kOneWayNetworkDelayMs, clock);
} }
const bool is_sender_;
RtcpPacketTypeCounter packets_sent_; RtcpPacketTypeCounter packets_sent_;
RtcpPacketTypeCounter packets_received_; RtcpPacketTypeCounter packets_received_;
std::unique_ptr<ReceiveStatistics> receive_statistics_; std::unique_ptr<ReceiveStatistics> receive_statistics_;
SendTransport transport_; SendTransport transport_;
RtcpRttStatsTestImpl rtt_stats_; RtcpRttStatsTestImpl rtt_stats_;
std::unique_ptr<ModuleRtpRtcpImpl> impl_; std::unique_ptr<ModuleRtpRtcpImpl> impl_;
uint32_t remote_ssrc_;
int rtcp_report_interval_ms_ = 0; int rtcp_report_interval_ms_ = 0;
void SetRemoteSsrc(uint32_t ssrc) {
remote_ssrc_ = ssrc;
impl_->SetRemoteSSRC(ssrc);
}
void RtcpPacketTypesCounterUpdated( void RtcpPacketTypesCounterUpdated(
uint32_t ssrc, uint32_t ssrc,
const RtcpPacketTypeCounter& packet_counter) override { const RtcpPacketTypeCounter& packet_counter) override {
@ -129,7 +124,7 @@ class RtpRtcpModule : public RtcpPacketTypeCounterObserver {
RtcpPacketTypeCounter RtcpSent() { RtcpPacketTypeCounter RtcpSent() {
// RTCP counters for remote SSRC. // RTCP counters for remote SSRC.
return counter_map_[remote_ssrc_]; return counter_map_[is_sender_ ? kReceiverSsrc : kSenderSsrc];
} }
RtcpPacketTypeCounter RtcpReceived() { RtcpPacketTypeCounter RtcpReceived() {
@ -158,9 +153,10 @@ class RtpRtcpModule : public RtcpPacketTypeCounterObserver {
config.rtcp_packet_type_counter_observer = this; config.rtcp_packet_type_counter_observer = this;
config.rtt_stats = &rtt_stats_; config.rtt_stats = &rtt_stats_;
config.rtcp_report_interval_ms = rtcp_report_interval_ms_; config.rtcp_report_interval_ms = rtcp_report_interval_ms_;
config.local_media_ssrc = kSenderSsrc; config.local_media_ssrc = is_sender_ ? kSenderSsrc : kReceiverSsrc;
impl_.reset(new ModuleRtpRtcpImpl(config)); impl_.reset(new ModuleRtpRtcpImpl(config));
impl_->SetRemoteSSRC(is_sender_ ? kReceiverSsrc : kSenderSsrc);
impl_->SetRTCPStatus(RtcpMode::kCompound); impl_->SetRTCPStatus(RtcpMode::kCompound);
} }
@ -172,13 +168,14 @@ class RtpRtcpModule : public RtcpPacketTypeCounterObserver {
class RtpRtcpImplTest : public ::testing::Test { class RtpRtcpImplTest : public ::testing::Test {
protected: protected:
RtpRtcpImplTest() RtpRtcpImplTest()
: clock_(133590000000000), sender_(&clock_), receiver_(&clock_) {} : clock_(133590000000000),
sender_(&clock_, /*is_sender=*/true),
receiver_(&clock_, /*is_sender=*/false) {}
void SetUp() override { void SetUp() override {
// Send module. // Send module.
EXPECT_EQ(0, sender_.impl_->SetSendingStatus(true)); EXPECT_EQ(0, sender_.impl_->SetSendingStatus(true));
sender_.impl_->SetSendingMediaStatus(true); sender_.impl_->SetSendingMediaStatus(true);
sender_.SetRemoteSsrc(kReceiverSsrc);
sender_.impl_->SetSequenceNumber(kSequenceNumber); sender_.impl_->SetSequenceNumber(kSequenceNumber);
sender_.impl_->SetStorePacketsStatus(true, 100); sender_.impl_->SetStorePacketsStatus(true, 100);
@ -196,8 +193,6 @@ class RtpRtcpImplTest : public ::testing::Test {
// Receive module. // Receive module.
EXPECT_EQ(0, receiver_.impl_->SetSendingStatus(false)); EXPECT_EQ(0, receiver_.impl_->SetSendingStatus(false));
receiver_.impl_->SetSendingMediaStatus(false); receiver_.impl_->SetSendingMediaStatus(false);
receiver_.impl_->SetSSRC(kReceiverSsrc);
receiver_.SetRemoteSsrc(kSenderSsrc);
// Transport settings. // Transport settings.
sender_.transport_.SetRtpRtcpModule(receiver_.impl_.get()); sender_.transport_.SetRtpRtcpModule(receiver_.impl_.get());
receiver_.transport_.SetRtpRtcpModule(sender_.impl_.get()); receiver_.transport_.SetRtpRtcpModule(sender_.impl_.get());