Skip to content

Commit

Permalink
Delete unused method RtpReceiver::CSRCs.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Commit-Queue: Niels Moller <[email protected]>
Cr-Commit-Position: refs/heads/master@{#24257}
  • Loading branch information
Niels Möller authored and Commit Bot committed Aug 10, 2018
1 parent 2ad8c43 commit d3b62cf
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 22 deletions.
3 changes: 0 additions & 3 deletions modules/rtp_rtcp/include/rtp_receiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions modules/rtp_rtcp/source/rtp_receiver_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions modules/rtp_rtcp/source/rtp_receiver_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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], "[email protected]"));
EXPECT_EQ(0, module1->AddMixedCNAME(test_csrcs[1], "[email protected]"));
Expand Down

0 comments on commit d3b62cf

Please sign in to comment.