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}
diff --git a/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h
index f49b748..e971c15 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -19,7 +19,6 @@
#include "modules/rtp_rtcp/include/report_block_data.h"
#include "modules/rtp_rtcp/include/rtcp_statistics.h"
-#include "modules/rtp_rtcp/include/rtp_rtcp.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/rtcp_nack_stats.h"
#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
@@ -52,7 +51,16 @@
virtual ~ModuleRtpRtcp() = default;
};
- RTCPReceiver(const RtpRtcp::Configuration& config, ModuleRtpRtcp* owner);
+ RTCPReceiver(Clock* clock,
+ bool receiver_only,
+ RtcpPacketTypeCounterObserver* packet_type_counter_observer,
+ RtcpBandwidthObserver* rtcp_bandwidth_observer,
+ RtcpIntraFrameObserver* rtcp_intra_frame_observer,
+ RtcpLossNotificationObserver* rtcp_loss_notification_observer,
+ TransportFeedbackObserver* transport_feedback_observer,
+ VideoBitrateAllocationObserver* bitrate_allocation_observer,
+ int report_interval_ms,
+ ModuleRtpRtcp* owner);
virtual ~RTCPReceiver();
void IncomingPacket(const uint8_t* packet, size_t packet_size);