admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused method RtpReceiver::CSRCs.

Browse Source 
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 <danilchap@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24257}
This commit is contained in:
Niels Möller 2018-08-10 10:50:30 +02:00 committed by Commit Bot
parent 2ad8c43ae7
commit d3b62cfb02
4 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/rtp_rtcp/include/rtp_receiver.h
View File

@ -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<RtpSource> GetSources() const = 0;
};
} // namespace webrtc

12
modules/rtp_rtcp/source/rtp_receiver_impl.cc
View File

@ -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,

2
modules/rtp_rtcp/source/rtp_receiver_impl.h
View File

@ -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<RtpSource> GetSources() const override;
const std::vector<RtpSource>& ssrc_sources_for_testing() const {

5
modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
View File

@ -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"));