zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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}
This commit is contained in:
Mirko Bonadei
2019-07-12 08:36:29 +00:00
committed by Commit Bot
parent 11820502b8
commit 4d68314ec8
5 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
modules/rtp_rtcp/source/rtcp_receiver.cc
View File

@ -63,8 +63,6 @@ const int64_t kRtcpMinFrameLengthMs = 17;
// Maximum number of received RRTRs that will be stored. // Maximum number of received RRTRs that will be stored.
const size_t kMaxNumberOfStoredRrtrs = 200; const size_t kMaxNumberOfStoredRrtrs = 200;
constexpr int32_t kDefaultVideoReportInterval = 1000;
constexpr int32_t kDefaultAudioReportInterval = 5000;
} // namespace } // namespace
struct RTCPReceiver::PacketInformation { struct RTCPReceiver::PacketInformation {
@ -120,21 +118,27 @@ struct RTCPReceiver::LastFirStatus {
uint8_t sequence_number; uint8_t sequence_number;
}; };
RTCPReceiver::RTCPReceiver(const RtpRtcp::Configuration& config, RTCPReceiver::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) ModuleRtpRtcp* owner)
: clock_(config.clock), : clock_(clock),
receiver_only_(config.receiver_only), receiver_only_(receiver_only),
rtp_rtcp_(owner), rtp_rtcp_(owner),
rtcp_bandwidth_observer_(config.bandwidth_callback), rtcp_bandwidth_observer_(rtcp_bandwidth_observer),
rtcp_intra_frame_observer_(config.intra_frame_callback), rtcp_intra_frame_observer_(rtcp_intra_frame_observer),
rtcp_loss_notification_observer_(config.rtcp_loss_notification_observer), rtcp_loss_notification_observer_(rtcp_loss_notification_observer),
transport_feedback_observer_(config.transport_feedback_callback), transport_feedback_observer_(transport_feedback_observer),
bitrate_allocation_observer_(config.bitrate_allocation_observer), bitrate_allocation_observer_(bitrate_allocation_observer),
report_interval_ms_(config.rtcp_report_interval_ms > 0 report_interval_ms_(report_interval_ms),
? config.rtcp_report_interval_ms main_ssrc_(0),
: (config.audio ? kDefaultAudioReportInterval
: kDefaultVideoReportInterval)),
main_ssrc_(config.media_send_ssrc.value_or(0)),
remote_ssrc_(0), remote_ssrc_(0),
remote_sender_rtp_time_(0), remote_sender_rtp_time_(0),
xr_rrtr_status_(false), xr_rrtr_status_(false),
@ -144,19 +148,10 @@ RTCPReceiver::RTCPReceiver(const RtpRtcp::Configuration& config,
last_increased_sequence_number_ms_(0), last_increased_sequence_number_ms_(0),
stats_callback_(nullptr), stats_callback_(nullptr),
report_block_data_observer_(nullptr), report_block_data_observer_(nullptr),
packet_type_counter_observer_(config.rtcp_packet_type_counter_observer), packet_type_counter_observer_(packet_type_counter_observer),
num_skipped_packets_(0), num_skipped_packets_(0),
last_skipped_packets_warning_ms_(clock_->TimeInMilliseconds()) { last_skipped_packets_warning_ms_(clock->TimeInMilliseconds()) {
RTC_DCHECK(owner); RTC_DCHECK(owner);
if (config.media_send_ssrc) {
registered_ssrcs_.insert(*config.media_send_ssrc);
}
if (config.rtx_send_ssrc) {
registered_ssrcs_.insert(*config.rtx_send_ssrc);
}
if (config.flexfec_sender) {
registered_ssrcs_.insert(config.flexfec_sender->ssrc());
}
} }
RTCPReceiver::~RTCPReceiver() {} RTCPReceiver::~RTCPReceiver() {}

12
modules/rtp_rtcp/source/rtcp_receiver.h
View File

@ -19,7 +19,6 @@
#include "modules/rtp_rtcp/include/report_block_data.h" #include "modules/rtp_rtcp/include/report_block_data.h"
#include "modules/rtp_rtcp/include/rtcp_statistics.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/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/rtcp_nack_stats.h" #include "modules/rtp_rtcp/source/rtcp_nack_stats.h"
#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
@ -52,7 +51,16 @@ class RTCPReceiver {
virtual ~ModuleRtpRtcp() = default; 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(); virtual ~RTCPReceiver();
void IncomingPacket(const uint8_t* packet, size_t packet_size); void IncomingPacket(const uint8_t* packet, size_t packet_size);

32
modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
View File

@ -132,28 +132,20 @@ class RtcpReceiverTest : public ::testing::Test {
protected: protected:
RtcpReceiverTest() RtcpReceiverTest()
: system_clock_(1335900000), : system_clock_(1335900000),
rtcp_receiver_( rtcp_receiver_(&system_clock_,
[&] { false,
RtpRtcp::Configuration config; &packet_type_counter_observer_,
config.clock = &system_clock_; &bandwidth_observer_,
config.receiver_only = false; &intra_frame_observer_,
config.rtcp_packet_type_counter_observer = &rtcp_loss_notification_observer_,
&packet_type_counter_observer_; &transport_feedback_observer_,
config.bandwidth_callback = &bandwidth_observer_; &bitrate_allocation_observer_,
config.intra_frame_callback = &intra_frame_observer_; kRtcpIntervalMs,
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_) {} &rtp_rtcp_impl_) {}
void SetUp() { void SetUp() {
std::set<uint32_t> ssrcs = {kReceiverMainSsrc, kReceiverExtraSsrc};
rtcp_receiver_.SetSsrcs(kReceiverMainSsrc, ssrcs);
rtcp_receiver_.SetRemoteSSRC(kSenderSsrc); rtcp_receiver_.SetRemoteSSRC(kSenderSsrc);
} }

16
modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -36,6 +36,8 @@ const int64_t kRtpRtcpMaxIdleTimeProcessMs = 5;
const int64_t kRtpRtcpRttProcessTimeMs = 1000; const int64_t kRtpRtcpRttProcessTimeMs = 1000;
const int64_t kRtpRtcpBitrateProcessTimeMs = 10; const int64_t kRtpRtcpBitrateProcessTimeMs = 10;
const int64_t kDefaultExpectedRetransmissionTimeMs = 125; const int64_t kDefaultExpectedRetransmissionTimeMs = 125;
constexpr int32_t kDefaultVideoReportInterval = 1000;
constexpr int32_t kDefaultAudioReportInterval = 5000;
} // namespace } // namespace
RtpRtcp::Configuration::Configuration() = default; RtpRtcp::Configuration::Configuration() = default;
@ -60,7 +62,19 @@ RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) {
ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration) ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration)
: rtcp_sender_(configuration), : rtcp_sender_(configuration),
rtcp_receiver_(configuration, this), rtcp_receiver_(configuration.clock,
configuration.receiver_only,
configuration.rtcp_packet_type_counter_observer,
configuration.bandwidth_callback,
configuration.intra_frame_callback,
configuration.rtcp_loss_notification_observer,
configuration.transport_feedback_callback,
configuration.bitrate_allocation_observer,
configuration.rtcp_report_interval_ms > 0
? configuration.rtcp_report_interval_ms
: (configuration.audio ? kDefaultAudioReportInterval
: kDefaultVideoReportInterval),
this),
clock_(configuration.clock), clock_(configuration.clock),
last_bitrate_process_time_(clock_->TimeInMilliseconds()), last_bitrate_process_time_(clock_->TimeInMilliseconds()),
last_rtt_process_time_(clock_->TimeInMilliseconds()), last_rtt_process_time_(clock_->TimeInMilliseconds()),

8
test/fuzzers/rtcp_receiver_fuzzer.cc
View File

@ -7,7 +7,6 @@
* in the file PATENTS. All contributing project authors may * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "modules/rtp_rtcp/include/rtp_rtcp.h"
#include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
#include "modules/rtp_rtcp/source/rtcp_receiver.h" #include "modules/rtp_rtcp/source/rtcp_receiver.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
@ -40,11 +39,8 @@ void FuzzOneInput(const uint8_t* data, size_t size) {
NullModuleRtpRtcp rtp_rtcp_module; NullModuleRtpRtcp rtp_rtcp_module;
SimulatedClock clock(1234); SimulatedClock clock(1234);
RtpRtcp::Configuration config; RTCPReceiver receiver(&clock, false, nullptr, nullptr, nullptr, nullptr,
config.clock = &clock; nullptr, nullptr, kRtcpIntervalMs, &rtp_rtcp_module);
config.rtcp_report_interval_ms = kRtcpIntervalMs;
RTCPReceiver receiver(config, &rtp_rtcp_module);
receiver.IncomingPacket(data, size); receiver.IncomingPacket(data, size);
} }