6fba6b795a
This is a reland of 9d230d54c7eef31ac1100f0aeef1374dd1ac62fa Original change's description: > (Un/)Subscribe RtpVideoSender for feedback on the transport queue. > > * RtpVideoSender now registers/unregisters for feedback callback > inside of SetActive(), which runs on the transport queue. > * Transport feedback is given on the transport queue > * Registration/unregistration for feedback is done on the same > * Removed the last mutex from TransportFeedbackDemuxer. > > Ultimately, this work is related to moving state from the Call > class, that's related to network configuration, but due to the code > is currently written is attached to the worker thread, over to the > Transport, where it's used (e.g. suspended_video_send_ssrcs_). > > Bug: webrtc:13517, webrtc:11993 > Change-Id: I057d0e2597e6cb746b335e0308599cd547350e56 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/248165 > Reviewed-by: Erik Språng <sprang@webrtc.org> > Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#35777} Bug: webrtc:13517, webrtc:11993 Change-Id: I766e569abea8bae96d32267a951fcdc195ced8a7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/249782 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35863}
95 lines
3.3 KiB
C++
95 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#include "modules/congestion_controller/rtp/transport_feedback_demuxer.h"
|
|
#include "absl/algorithm/container.h"
|
|
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
|
|
|
|
namespace webrtc {
|
|
namespace {
|
|
static const size_t kMaxPacketsInHistory = 5000;
|
|
}
|
|
|
|
TransportFeedbackDemuxer::TransportFeedbackDemuxer() {
|
|
// In case the construction thread is different from where the registration
|
|
// and callbacks occur, detach from the construction thread.
|
|
observer_checker_.Detach();
|
|
}
|
|
|
|
void TransportFeedbackDemuxer::RegisterStreamFeedbackObserver(
|
|
std::vector<uint32_t> ssrcs,
|
|
StreamFeedbackObserver* observer) {
|
|
RTC_DCHECK_RUN_ON(&observer_checker_);
|
|
RTC_DCHECK(observer);
|
|
RTC_DCHECK(absl::c_find_if(observers_, [=](const auto& pair) {
|
|
return pair.second == observer;
|
|
}) == observers_.end());
|
|
observers_.push_back({ssrcs, observer});
|
|
}
|
|
|
|
void TransportFeedbackDemuxer::DeRegisterStreamFeedbackObserver(
|
|
StreamFeedbackObserver* observer) {
|
|
RTC_DCHECK_RUN_ON(&observer_checker_);
|
|
RTC_DCHECK(observer);
|
|
const auto it = absl::c_find_if(
|
|
observers_, [=](const auto& pair) { return pair.second == observer; });
|
|
RTC_DCHECK(it != observers_.end());
|
|
observers_.erase(it);
|
|
}
|
|
|
|
void TransportFeedbackDemuxer::AddPacket(const RtpPacketSendInfo& packet_info) {
|
|
RTC_DCHECK_RUN_ON(&observer_checker_);
|
|
|
|
StreamFeedbackObserver::StreamPacketInfo info;
|
|
info.ssrc = packet_info.media_ssrc;
|
|
info.rtp_sequence_number = packet_info.rtp_sequence_number;
|
|
info.received = false;
|
|
info.is_retransmission =
|
|
packet_info.packet_type == RtpPacketMediaType::kRetransmission;
|
|
history_.insert(
|
|
{seq_num_unwrapper_.Unwrap(packet_info.transport_sequence_number), info});
|
|
|
|
while (history_.size() > kMaxPacketsInHistory) {
|
|
history_.erase(history_.begin());
|
|
}
|
|
}
|
|
|
|
void TransportFeedbackDemuxer::OnTransportFeedback(
|
|
const rtcp::TransportFeedback& feedback) {
|
|
RTC_DCHECK_RUN_ON(&observer_checker_);
|
|
|
|
std::vector<StreamFeedbackObserver::StreamPacketInfo> stream_feedbacks;
|
|
for (const auto& packet : feedback.GetAllPackets()) {
|
|
int64_t seq_num =
|
|
seq_num_unwrapper_.UnwrapWithoutUpdate(packet.sequence_number());
|
|
auto it = history_.find(seq_num);
|
|
if (it != history_.end()) {
|
|
auto packet_info = it->second;
|
|
packet_info.received = packet.received();
|
|
stream_feedbacks.push_back(std::move(packet_info));
|
|
if (packet.received())
|
|
history_.erase(it);
|
|
}
|
|
}
|
|
|
|
for (auto& observer : observers_) {
|
|
std::vector<StreamFeedbackObserver::StreamPacketInfo> selected_feedback;
|
|
for (const auto& packet_info : stream_feedbacks) {
|
|
if (absl::c_count(observer.first, packet_info.ssrc) > 0) {
|
|
selected_feedback.push_back(packet_info);
|
|
}
|
|
}
|
|
if (!selected_feedback.empty()) {
|
|
observer.second->OnPacketFeedbackVector(std::move(selected_feedback));
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|