commit 4d68314ec87b689792c9db9e2e50b76659bd42d9
author Mirko Bonadei <mbonadei@webrtc.org> Fri Jul 12 08:36:29 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Jul 12 08:36:48 2019 +0000
tree 9b04c84e18626e0e9e167e37e7405c5d96401fbb
parent 11820502b840f34aa9fccb1c273cefbcc457c962

Revert "Pass RtpRtcp::Configuration to RtcpReceiver ctor and initialize ssrcs"

This reverts commit 741b96b175cb20606d5f1aad6339beeaa424b719.

Reason for revert: Speculative revert (some perf test are failing)

Original change's description:
> Pass RtpRtcp::Configuration to RtcpReceiver ctor and initialize ssrcs
> 
> Bug: webrtc:10774
> Change-Id: Iaae717ed1b7373d5cb2246e3ba92fc6ace422b41
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145206
> Commit-Queue: Erik Språng <sprang@webrtc.org>
> Reviewed-by: Åsa Persson <asapersson@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#28536}

TBR=asapersson@webrtc.org,sprang@webrtc.org

Change-Id: I877c1e4c025717c3392bce96ef31591dc1ef5f0b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10774
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145325
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28551}

modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

diff --git a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index 8a2a89e..6fa2cdf 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -132,28 +132,20 @@
  protected:
   RtcpReceiverTest()
       : system_clock_(1335900000),
-        rtcp_receiver_(
-            [&] {
-              RtpRtcp::Configuration config;
-              config.clock = &system_clock_;
-              config.receiver_only = false;
-              config.rtcp_packet_type_counter_observer =
-                  &packet_type_counter_observer_;
-              config.bandwidth_callback = &bandwidth_observer_;
-              config.intra_frame_callback = &intra_frame_observer_;
-              config.rtcp_loss_notification_observer =
-                  &rtcp_loss_notification_observer_;
-              config.transport_feedback_callback =
-                  &transport_feedback_observer_;
-              config.bitrate_allocation_observer =
-                  &bitrate_allocation_observer_;
-              config.rtcp_report_interval_ms = kRtcpIntervalMs;
-              config.media_send_ssrc = kReceiverMainSsrc;
-              config.rtx_send_ssrc = kReceiverExtraSsrc;
-              return config;
-            }(),
-            &rtp_rtcp_impl_) {}
+        rtcp_receiver_(&system_clock_,
+                       false,
+                       &packet_type_counter_observer_,
+                       &bandwidth_observer_,
+                       &intra_frame_observer_,
+                       &rtcp_loss_notification_observer_,
+                       &transport_feedback_observer_,
+                       &bitrate_allocation_observer_,
+                       kRtcpIntervalMs,
+                       &rtp_rtcp_impl_) {}
   void SetUp() {
+    std::set<uint32_t> ssrcs = {kReceiverMainSsrc, kReceiverExtraSsrc};
+    rtcp_receiver_.SetSsrcs(kReceiverMainSsrc, ssrcs);
+
     rtcp_receiver_.SetRemoteSSRC(kSenderSsrc);
   }