Delete OnIncomingCSRCChanged and related code.
Bug: webrtc:8995
Change-Id: I1987d1527cce5a0c315b2d15cfffa76e7343b1fa
Reviewed-on: https://webrtc-review.googlesource.com/64220
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22626}diff --git a/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/modules/rtp_rtcp/source/rtp_receiver_impl.cc
index 1fd45bd..60056c8 100644
--- a/modules/rtp_rtcp/source/rtp_receiver_impl.cc
+++ b/modules/rtp_rtcp/source/rtp_receiver_impl.cc
@@ -102,11 +102,7 @@
memset(current_remote_csrc_, 0, sizeof(current_remote_csrc_));
}
-RtpReceiverImpl::~RtpReceiverImpl() {
- for (int i = 0; i < num_csrcs_; ++i) {
- cb_rtp_feedback_->OnIncomingCSRCChanged(current_remote_csrc_[i], false);
- }
-}
+RtpReceiverImpl::~RtpReceiverImpl() {}
int32_t RtpReceiverImpl::RegisterReceivePayload(
int payload_type,
@@ -342,84 +338,21 @@
// Implementation note: must not hold critsect when called.
void RtpReceiverImpl::CheckCSRC(const WebRtcRTPHeader& rtp_header) {
- int32_t num_csrcs_diff = 0;
- uint32_t old_remote_csrc[kRtpCsrcSize];
- uint8_t old_num_csrcs = 0;
-
+ const uint8_t num_csrcs = rtp_header.header.numCSRCs;
+ if (num_csrcs > kRtpCsrcSize) {
+ // Ignore.
+ return;
+ }
{
rtc::CritScope lock(&critical_section_rtp_receiver_);
- if (!rtp_media_receiver_->ShouldReportCsrcChanges(
- rtp_header.header.payloadType)) {
- return;
- }
- old_num_csrcs = num_csrcs_;
- if (old_num_csrcs > 0) {
- // Make a copy of old.
- memcpy(old_remote_csrc, current_remote_csrc_,
- num_csrcs_ * sizeof(uint32_t));
- }
- const uint8_t num_csrcs = rtp_header.header.numCSRCs;
- if ((num_csrcs > 0) && (num_csrcs <= kRtpCsrcSize)) {
- // Copy new.
- memcpy(current_remote_csrc_,
- rtp_header.header.arrOfCSRCs,
- num_csrcs * sizeof(uint32_t));
- }
- if (num_csrcs > 0 || old_num_csrcs > 0) {
- num_csrcs_diff = num_csrcs - old_num_csrcs;
- num_csrcs_ = num_csrcs; // Update stored CSRCs.
- } else {
- // No change.
- return;
- }
+ // Copy new.
+ memcpy(current_remote_csrc_,
+ rtp_header.header.arrOfCSRCs,
+ num_csrcs * sizeof(uint32_t));
+
+ num_csrcs_ = num_csrcs;
} // End critsect.
-
- bool have_called_callback = false;
- // Search for new CSRC in old array.
- for (uint8_t i = 0; i < rtp_header.header.numCSRCs; ++i) {
- const uint32_t csrc = rtp_header.header.arrOfCSRCs[i];
-
- bool found_match = false;
- for (uint8_t j = 0; j < old_num_csrcs; ++j) {
- if (csrc == old_remote_csrc[j]) { // old list
- found_match = true;
- break;
- }
- }
- if (!found_match && csrc) {
- // Didn't find it, report it as new.
- have_called_callback = true;
- cb_rtp_feedback_->OnIncomingCSRCChanged(csrc, true);
- }
- }
- // Search for old CSRC in new array.
- for (uint8_t i = 0; i < old_num_csrcs; ++i) {
- const uint32_t csrc = old_remote_csrc[i];
-
- bool found_match = false;
- for (uint8_t j = 0; j < rtp_header.header.numCSRCs; ++j) {
- if (csrc == rtp_header.header.arrOfCSRCs[j]) {
- found_match = true;
- break;
- }
- }
- if (!found_match && csrc) {
- // Did not find it, report as removed.
- have_called_callback = true;
- cb_rtp_feedback_->OnIncomingCSRCChanged(csrc, false);
- }
- }
- if (!have_called_callback) {
- // If the CSRC list contain non-unique entries we will end up here.
- // Using CSRC 0 to signal this event, not interop safe, other
- // implementations might have CSRC 0 as a valid value.
- if (num_csrcs_diff > 0) {
- cb_rtp_feedback_->OnIncomingCSRCChanged(0, true);
- } else if (num_csrcs_diff < 0) {
- cb_rtp_feedback_->OnIncomingCSRCChanged(0, false);
- }
- }
}
void RtpReceiverImpl::UpdateSources(