From d3b62cfb027abd77a2aa58098e87f5f258f75963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 10 Aug 2018 10:50:30 +0200 Subject: [PATCH] Delete unused method RtpReceiver::CSRCs. This is a preparation for extracting CSRC book-keeping to its own class. Bug: webrtc:7135 Change-Id: Ic51ceb57ec53a43064a3d0392de8baa978a4e8cf Reviewed-on: https://webrtc-review.googlesource.com/93463 Reviewed-by: Danil Chapovalov Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#24257} --- modules/rtp_rtcp/include/rtp_receiver.h | 3 --- modules/rtp_rtcp/source/rtp_receiver_impl.cc | 12 ------------ modules/rtp_rtcp/source/rtp_receiver_impl.h | 2 -- modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc | 5 ----- 4 files changed, 22 deletions(-) diff --git a/modules/rtp_rtcp/include/rtp_receiver.h b/modules/rtp_rtcp/include/rtp_receiver.h index 8e2737d93c..d93d6566ef 100644 --- a/modules/rtp_rtcp/include/rtp_receiver.h +++ b/modules/rtp_rtcp/include/rtp_receiver.h @@ -79,9 +79,6 @@ class RtpReceiver { // Returns the remote SSRC of the currently received RTP stream. virtual uint32_t SSRC() const = 0; - // Returns the current remote CSRCs. - virtual int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const = 0; - virtual std::vector GetSources() const = 0; }; } // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/modules/rtp_rtcp/source/rtp_receiver_impl.cc index 1646444bb6..23f8b8b7d5 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_impl.cc +++ b/modules/rtp_rtcp/source/rtp_receiver_impl.cc @@ -123,18 +123,6 @@ uint32_t RtpReceiverImpl::SSRC() const { return ssrc_; } -// Get remote CSRC. -int32_t RtpReceiverImpl::CSRCs(uint32_t array_of_csrcs[kRtpCsrcSize]) const { - rtc::CritScope lock(&critical_section_rtp_receiver_); - - assert(num_csrcs_ <= kRtpCsrcSize); - - if (num_csrcs_ > 0) { - memcpy(array_of_csrcs, current_remote_csrc_, sizeof(uint32_t) * num_csrcs_); - } - return num_csrcs_; -} - bool RtpReceiverImpl::IncomingRtpPacket(const RTPHeader& rtp_header, const uint8_t* payload, size_t payload_length, diff --git a/modules/rtp_rtcp/source/rtp_receiver_impl.h b/modules/rtp_rtcp/source/rtp_receiver_impl.h index d898d7371e..229c619539 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_impl.h +++ b/modules/rtp_rtcp/source/rtp_receiver_impl.h @@ -51,8 +51,6 @@ class RtpReceiverImpl : public RtpReceiver { uint32_t SSRC() const override; - int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const override; - std::vector GetSources() const override; const std::vector& ssrc_sources_for_testing() const { diff --git a/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc index 44b1ff5264..b6368f7fbb 100644 --- a/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc +++ b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc @@ -161,11 +161,6 @@ class RtpRtcpRtcpTest : public ::testing::Test { }; TEST_F(RtpRtcpRtcpTest, RTCP_CNAME) { - uint32_t testOfCSRC[webrtc::kRtpCsrcSize]; - EXPECT_EQ(2, rtp_receiver2_->CSRCs(testOfCSRC)); - EXPECT_EQ(test_csrcs[0], testOfCSRC[0]); - EXPECT_EQ(test_csrcs[1], testOfCSRC[1]); - // Set cname of mixed. EXPECT_EQ(0, module1->AddMixedCNAME(test_csrcs[0], "john@192.168.0.1")); EXPECT_EQ(0, module1->AddMixedCNAME(test_csrcs[1], "jane@192.168.0.2"));