Add Incoming packet handler to RtcpTransceiver
Bug: webrtc:8239
Change-Id: Iebe1b6a2649f01e4f6e3780ac96cb05611d8671c
Reviewed-on: https://webrtc-review.googlesource.com/17560
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20624}diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
index 4c4ae95..5b1224d 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
@@ -11,15 +11,17 @@
#include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h"
#include <utility>
-#include <vector>
#include "api/call/transport.h"
#include "modules/rtp_rtcp/include/receive_statistics.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/rtcp_packet.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h"
#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
+#include "modules/rtp_rtcp/source/time_util.h"
#include "rtc_base/checks.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/task_queue.h"
@@ -76,12 +78,41 @@
RtcpTransceiverImpl::~RtcpTransceiverImpl() = default;
+void RtcpTransceiverImpl::ReceivePacket(rtc::ArrayView<const uint8_t> packet) {
+ while (!packet.empty()) {
+ rtcp::CommonHeader rtcp_block;
+ if (!rtcp_block.Parse(packet.data(), packet.size()))
+ return;
+
+ HandleReceivedPacket(rtcp_block);
+
+ // TODO(danilchap): Use packet.remove_prefix() when that function exists.
+ packet = packet.subview(rtcp_block.packet_size());
+ }
+}
+
void RtcpTransceiverImpl::SendCompoundPacket() {
SendPacket();
if (config_.schedule_periodic_compound_packets)
ReschedulePeriodicCompoundPackets(config_.report_period_ms);
}
+void RtcpTransceiverImpl::HandleReceivedPacket(
+ const rtcp::CommonHeader& rtcp_packet_header) {
+ switch (rtcp_packet_header.type()) {
+ case rtcp::SenderReport::kPacketType: {
+ rtcp::SenderReport sender_report;
+ if (!sender_report.Parse(rtcp_packet_header))
+ return;
+ SenderReportTimes& last =
+ last_received_sender_reports_[sender_report.sender_ssrc()];
+ last.local_received_time_us = rtc::TimeMicros();
+ last.remote_sent_time = sender_report.ntp();
+ break;
+ }
+ }
+}
+
void RtcpTransceiverImpl::ReschedulePeriodicCompoundPackets(int64_t delay_ms) {
class SendPeriodicCompoundPacket : public rtc::QueuedTask {
public:
@@ -119,19 +150,11 @@
void RtcpTransceiverImpl::SendPacket() {
PacketSender sender(config_.outgoing_transport, config_.max_packet_size);
- rtcp::ReceiverReport rr;
- rr.SetSenderSsrc(config_.feedback_ssrc);
- if (config_.receive_statistics) {
- // TODO(danilchap): Support sending more than
- // |ReceiverReport::kMaxNumberOfReportBlocks| per compound rtcp packet.
- std::vector<rtcp::ReportBlock> report_blocks =
- config_.receive_statistics->RtcpReportBlocks(
- rtcp::ReceiverReport::kMaxNumberOfReportBlocks);
- // TODO(danilchap): Fill in LastSr/DelayLastSr fields of report blocks
- // when RtcpTransceiver handles incoming sender reports.
- rr.SetReportBlocks(std::move(report_blocks));
- }
- sender.AppendPacket(rr);
+ rtcp::ReceiverReport receiver_report;
+ receiver_report.SetSenderSsrc(config_.feedback_ssrc);
+ receiver_report.SetReportBlocks(CreateReportBlocks());
+ sender.AppendPacket(receiver_report);
+
if (!config_.cname.empty()) {
rtcp::Sdes sdes;
bool added = sdes.AddCName(config_.feedback_ssrc, config_.cname);
@@ -143,4 +166,24 @@
sender.Send();
}
+std::vector<rtcp::ReportBlock> RtcpTransceiverImpl::CreateReportBlocks() {
+ if (!config_.receive_statistics)
+ return {};
+ // TODO(danilchap): Support sending more than
+ // |ReceiverReport::kMaxNumberOfReportBlocks| per compound rtcp packet.
+ std::vector<rtcp::ReportBlock> report_blocks =
+ config_.receive_statistics->RtcpReportBlocks(
+ rtcp::ReceiverReport::kMaxNumberOfReportBlocks);
+ for (rtcp::ReportBlock& report_block : report_blocks) {
+ auto it = last_received_sender_reports_.find(report_block.source_ssrc());
+ if (it == last_received_sender_reports_.end())
+ continue;
+ const SenderReportTimes& last_sender_report = it->second;
+ report_block.SetLastSr(CompactNtp(last_sender_report.remote_sent_time));
+ report_block.SetDelayLastSr(SaturatedUsToCompactNtp(
+ rtc::TimeMicros() - last_sender_report.local_received_time_us));
+ }
+ return report_blocks;
+}
+
} // namespace webrtc