From 95a64ca8aa3ab20692bf8fbb24c7ea7b72abb0a6 Mon Sep 17 00:00:00 2001
From: zhihuang <zhihuang@webrtc.org>
Date: Fri, 25 Aug 2017 12:59:42 -0700
Subject: [PATCH] Revert of Verify sender ssrc when receiving rtcp target
 bitrate (patchset #3 id:40001 of https://codereview.webrtc.org/3000373002/ )

Reason for revert:
Might be the root cause of an internal test failure.

Original issue's description:
> Verify sender ssrc when receiving rtcp target bitrate
>
> BUG=webrtc:8137
>
> Review-Url: https://codereview.webrtc.org/3000373002
> Cr-Commit-Position: refs/heads/master@{#19524}
> Committed: https://chromium.googlesource.com/external/webrtc/+/a7a4beb419612e16e781e143f9bc0c812e044f75

TBR=danilchap@webrtc.org,sprang@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:8137

Review-Url: https://codereview.webrtc.org/3005633002
Cr-Commit-Position: refs/heads/master@{#19529}
---
 webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc       | 11 ++---------
 webrtc/modules/rtp_rtcp/source/rtcp_receiver.h        |  3 +--
 .../modules/rtp_rtcp/source/rtcp_receiver_unittest.cc | 10 ----------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index 666e1e23dc..7270f3928a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -688,10 +688,8 @@ void RTCPReceiver::HandleXr(const CommonHeader& rtcp_block,
   for (const rtcp::ReceiveTimeInfo& time_info : xr.dlrr().sub_blocks())
     HandleXrDlrrReportBlock(time_info);
 
-  if (xr.target_bitrate()) {
-    HandleXrTargetBitrate(xr.sender_ssrc(), *xr.target_bitrate(),
-                          packet_information);
-  }
+  if (xr.target_bitrate())
+    HandleXrTargetBitrate(*xr.target_bitrate(), packet_information);
 }
 
 void RTCPReceiver::HandleXrReceiveReferenceTime(uint32_t sender_ssrc,
@@ -724,13 +722,8 @@ void RTCPReceiver::HandleXrDlrrReportBlock(const rtcp::ReceiveTimeInfo& rti) {
 }
 
 void RTCPReceiver::HandleXrTargetBitrate(
-    uint32_t ssrc,
     const rtcp::TargetBitrate& target_bitrate,
     PacketInformation* packet_information) {
-  if (ssrc != remote_ssrc_) {
-    return;  // Not for us.
-  }
-
   BitrateAllocation bitrate_allocation;
   for (const auto& item : target_bitrate.GetTargetBitrates()) {
     if (item.spatial_layer >= kMaxSpatialLayers ||
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
index a167c135b0..5f0b151d42 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -165,8 +165,7 @@ class RTCPReceiver {
   void HandleXrDlrrReportBlock(const rtcp::ReceiveTimeInfo& rti)
       EXCLUSIVE_LOCKS_REQUIRED(rtcp_receiver_lock_);
 
-  void HandleXrTargetBitrate(uint32_t ssrc,
-                             const rtcp::TargetBitrate& target_bitrate,
+  void HandleXrTargetBitrate(const rtcp::TargetBitrate& target_bitrate,
                              PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(rtcp_receiver_lock_);
 
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index d42a74e6a1..3ad333c6b9 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -1225,15 +1225,6 @@ TEST_F(RtcpReceiverTest, ReceivesTargetBitrate) {
   rtcp::ExtendedReports xr;
   xr.SetTargetBitrate(bitrate);
 
-  // Wrong sender ssrc, target bitrate should be discarded.
-  xr.SetSenderSsrc(kSenderSsrc + 1);
-  EXPECT_CALL(bitrate_allocation_observer_,
-              OnBitrateAllocationUpdated(expected_allocation))
-      .Times(0);
-  InjectRtcpPacket(xr);
-
-  // Set correct ssrc, callback should be called once.
-  xr.SetSenderSsrc(kSenderSsrc);
   EXPECT_CALL(bitrate_allocation_observer_,
               OnBitrateAllocationUpdated(expected_allocation));
   InjectRtcpPacket(xr);
@@ -1250,7 +1241,6 @@ TEST_F(RtcpReceiverTest, HandlesIncorrectTargetBitrate) {
 
   rtcp::ExtendedReports xr;
   xr.SetTargetBitrate(bitrate);
-  xr.SetSenderSsrc(kSenderSsrc);
 
   EXPECT_CALL(bitrate_allocation_observer_,
               OnBitrateAllocationUpdated(expected_allocation));