
BaseChannel adds and removes receive streams on the worker thread (UpdateRemoteStreams_w) and then posts a task to the network thread to update the demuxer criteria. Until this happens, OnRtpPacket() keeps forwarding "recently removed" ssrc packets to the WebRtcVideoChannel. Furthermore WebRtcVideoChannel::OnPacketReceived() posts task from the network thread to the worker thread, so even if the demuxer criteria was instantly updated we would still have an issue of in-flight packets for old ssrcs arriving late on the worker thread inside WebRtcVideoChannel. The wrong ssrc could also arrive when the demuxer goes from forwarding all packets to a single m= section to forwarding to different m= sections. In this case we get packets with an ssrc for a recently created m= section and the ssrc was never intended for our channel. This is a problem because when WebRtcVideoChannel sees an unknown ssrc it treats it as an unsignalled stream, creating and destroying default streams which can be very expensive and introduce large delays when lots of packets are queued up. This CL addresses the issue with callbacks for when a demuxer criteria update is pending and when it has completed. During this window of time, WebRtcVideoChannel will drop packets for unknown ssrcs. This approach fixes the race without introducing any new locks and packets belonging to ssrcs that were not removed continue to be forwarded even if a demuxer criteria update is pending. This should make a=inactive for 50p receive streams a glitch-free experience. Bug: webrtc:12258, chromium:1069603 Change-Id: I30d85f53d84e7eddf7d21380fb608631863aad21 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/214964 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Taylor <deadbeef@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33757}
437 lines
14 KiB
C++
437 lines
14 KiB
C++
/*
|
|
* Copyright (c) 2017 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 "call/rtp_demuxer.h"
|
|
|
|
#include "call/rtp_packet_sink_interface.h"
|
|
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
|
|
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/logging.h"
|
|
#include "rtc_base/strings/string_builder.h"
|
|
|
|
namespace webrtc {
|
|
namespace {
|
|
|
|
template <typename Container, typename Value>
|
|
size_t RemoveFromMultimapByValue(Container* multimap, const Value& value) {
|
|
size_t count = 0;
|
|
for (auto it = multimap->begin(); it != multimap->end();) {
|
|
if (it->second == value) {
|
|
it = multimap->erase(it);
|
|
++count;
|
|
} else {
|
|
++it;
|
|
}
|
|
}
|
|
return count;
|
|
}
|
|
|
|
template <typename Map, typename Value>
|
|
size_t RemoveFromMapByValue(Map* map, const Value& value) {
|
|
size_t count = 0;
|
|
for (auto it = map->begin(); it != map->end();) {
|
|
if (it->second == value) {
|
|
it = map->erase(it);
|
|
++count;
|
|
} else {
|
|
++it;
|
|
}
|
|
}
|
|
return count;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
RtpDemuxerCriteria::RtpDemuxerCriteria() = default;
|
|
RtpDemuxerCriteria::~RtpDemuxerCriteria() = default;
|
|
|
|
bool RtpDemuxerCriteria::operator==(const RtpDemuxerCriteria& other) const {
|
|
return this->mid == other.mid && this->rsid == other.rsid &&
|
|
this->ssrcs == other.ssrcs &&
|
|
this->payload_types == other.payload_types;
|
|
}
|
|
|
|
bool RtpDemuxerCriteria::operator!=(const RtpDemuxerCriteria& other) const {
|
|
return !(*this == other);
|
|
}
|
|
|
|
std::string RtpDemuxerCriteria::ToString() const {
|
|
rtc::StringBuilder sb;
|
|
sb << "{mid: " << (mid.empty() ? "<empty>" : mid)
|
|
<< ", rsid: " << (rsid.empty() ? "<empty>" : rsid) << ", ssrcs: [";
|
|
|
|
for (auto ssrc : ssrcs) {
|
|
sb << ssrc << ", ";
|
|
}
|
|
|
|
sb << "], payload_types = [";
|
|
|
|
for (auto pt : payload_types) {
|
|
sb << pt << ", ";
|
|
}
|
|
|
|
sb << "]}";
|
|
return sb.Release();
|
|
}
|
|
|
|
// static
|
|
std::string RtpDemuxer::DescribePacket(const RtpPacketReceived& packet) {
|
|
rtc::StringBuilder sb;
|
|
sb << "PT=" << packet.PayloadType() << " SSRC=" << packet.Ssrc();
|
|
std::string mid;
|
|
if (packet.GetExtension<RtpMid>(&mid)) {
|
|
sb << " MID=" << mid;
|
|
}
|
|
std::string rsid;
|
|
if (packet.GetExtension<RtpStreamId>(&rsid)) {
|
|
sb << " RSID=" << rsid;
|
|
}
|
|
std::string rrsid;
|
|
if (packet.GetExtension<RepairedRtpStreamId>(&rrsid)) {
|
|
sb << " RRSID=" << rrsid;
|
|
}
|
|
return sb.Release();
|
|
}
|
|
|
|
RtpDemuxer::RtpDemuxer(bool use_mid /* = true*/) : use_mid_(use_mid) {}
|
|
|
|
RtpDemuxer::~RtpDemuxer() {
|
|
RTC_DCHECK(sink_by_mid_.empty());
|
|
RTC_DCHECK(sink_by_ssrc_.empty());
|
|
RTC_DCHECK(sinks_by_pt_.empty());
|
|
RTC_DCHECK(sink_by_mid_and_rsid_.empty());
|
|
RTC_DCHECK(sink_by_rsid_.empty());
|
|
}
|
|
|
|
bool RtpDemuxer::AddSink(const RtpDemuxerCriteria& criteria,
|
|
RtpPacketSinkInterface* sink) {
|
|
RTC_DCHECK(!criteria.payload_types.empty() || !criteria.ssrcs.empty() ||
|
|
!criteria.mid.empty() || !criteria.rsid.empty());
|
|
RTC_DCHECK(criteria.mid.empty() || IsLegalMidName(criteria.mid));
|
|
RTC_DCHECK(criteria.rsid.empty() || IsLegalRsidName(criteria.rsid));
|
|
RTC_DCHECK(sink);
|
|
|
|
// We return false instead of DCHECKing for logical conflicts with the new
|
|
// criteria because new sinks are created according to user-specified SDP and
|
|
// we do not want to crash due to a data validation error.
|
|
if (CriteriaWouldConflict(criteria)) {
|
|
RTC_LOG(LS_ERROR) << "Unable to add sink = " << sink
|
|
<< " due conflicting criteria " << criteria.ToString();
|
|
return false;
|
|
}
|
|
|
|
if (!criteria.mid.empty()) {
|
|
if (criteria.rsid.empty()) {
|
|
sink_by_mid_.emplace(criteria.mid, sink);
|
|
} else {
|
|
sink_by_mid_and_rsid_.emplace(std::make_pair(criteria.mid, criteria.rsid),
|
|
sink);
|
|
}
|
|
} else {
|
|
if (!criteria.rsid.empty()) {
|
|
sink_by_rsid_.emplace(criteria.rsid, sink);
|
|
}
|
|
}
|
|
|
|
for (uint32_t ssrc : criteria.ssrcs) {
|
|
sink_by_ssrc_.emplace(ssrc, sink);
|
|
}
|
|
|
|
for (uint8_t payload_type : criteria.payload_types) {
|
|
sinks_by_pt_.emplace(payload_type, sink);
|
|
}
|
|
|
|
RefreshKnownMids();
|
|
|
|
RTC_LOG(LS_INFO) << "Added sink = " << sink << " for criteria "
|
|
<< criteria.ToString();
|
|
|
|
return true;
|
|
}
|
|
|
|
bool RtpDemuxer::CriteriaWouldConflict(
|
|
const RtpDemuxerCriteria& criteria) const {
|
|
if (!criteria.mid.empty()) {
|
|
if (criteria.rsid.empty()) {
|
|
// If the MID is in the known_mids_ set, then there is already a sink
|
|
// added for this MID directly, or there is a sink already added with a
|
|
// MID, RSID pair for our MID and some RSID.
|
|
// Adding this criteria would cause one of these rules to be shadowed, so
|
|
// reject this new criteria.
|
|
if (known_mids_.find(criteria.mid) != known_mids_.end()) {
|
|
RTC_LOG(LS_INFO) << criteria.ToString()
|
|
<< " would conflict with known mid";
|
|
return true;
|
|
}
|
|
} else {
|
|
// If the exact rule already exists, then reject this duplicate.
|
|
const auto sink_by_mid_and_rsid = sink_by_mid_and_rsid_.find(
|
|
std::make_pair(criteria.mid, criteria.rsid));
|
|
if (sink_by_mid_and_rsid != sink_by_mid_and_rsid_.end()) {
|
|
RTC_LOG(LS_INFO) << criteria.ToString()
|
|
<< " would conflict with existing sink = "
|
|
<< sink_by_mid_and_rsid->second
|
|
<< " by mid+rsid binding";
|
|
return true;
|
|
}
|
|
// If there is already a sink registered for the bare MID, then this
|
|
// criteria will never receive any packets because they will just be
|
|
// directed to that MID sink, so reject this new criteria.
|
|
const auto sink_by_mid = sink_by_mid_.find(criteria.mid);
|
|
if (sink_by_mid != sink_by_mid_.end()) {
|
|
RTC_LOG(LS_INFO) << criteria.ToString()
|
|
<< " would conflict with existing sink = "
|
|
<< sink_by_mid->second << " by mid binding";
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
|
|
for (uint32_t ssrc : criteria.ssrcs) {
|
|
const auto sink_by_ssrc = sink_by_ssrc_.find(ssrc);
|
|
if (sink_by_ssrc != sink_by_ssrc_.end()) {
|
|
RTC_LOG(LS_INFO) << criteria.ToString()
|
|
<< " would conflict with existing sink = "
|
|
<< sink_by_ssrc->second << " binding by SSRC=" << ssrc;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
// TODO(steveanton): May also sanity check payload types.
|
|
|
|
return false;
|
|
}
|
|
|
|
void RtpDemuxer::RefreshKnownMids() {
|
|
known_mids_.clear();
|
|
|
|
for (auto const& item : sink_by_mid_) {
|
|
const std::string& mid = item.first;
|
|
known_mids_.insert(mid);
|
|
}
|
|
|
|
for (auto const& item : sink_by_mid_and_rsid_) {
|
|
const std::string& mid = item.first.first;
|
|
known_mids_.insert(mid);
|
|
}
|
|
}
|
|
|
|
bool RtpDemuxer::AddSink(uint32_t ssrc, RtpPacketSinkInterface* sink) {
|
|
RtpDemuxerCriteria criteria;
|
|
criteria.ssrcs.insert(ssrc);
|
|
return AddSink(criteria, sink);
|
|
}
|
|
|
|
void RtpDemuxer::AddSink(const std::string& rsid,
|
|
RtpPacketSinkInterface* sink) {
|
|
RtpDemuxerCriteria criteria;
|
|
criteria.rsid = rsid;
|
|
AddSink(criteria, sink);
|
|
}
|
|
|
|
bool RtpDemuxer::RemoveSink(const RtpPacketSinkInterface* sink) {
|
|
RTC_DCHECK(sink);
|
|
size_t num_removed = RemoveFromMapByValue(&sink_by_mid_, sink) +
|
|
RemoveFromMapByValue(&sink_by_ssrc_, sink) +
|
|
RemoveFromMultimapByValue(&sinks_by_pt_, sink) +
|
|
RemoveFromMapByValue(&sink_by_mid_and_rsid_, sink) +
|
|
RemoveFromMapByValue(&sink_by_rsid_, sink);
|
|
RefreshKnownMids();
|
|
bool removed = num_removed > 0;
|
|
if (removed) {
|
|
RTC_LOG(LS_INFO) << "Removed sink = " << sink << " bindings";
|
|
}
|
|
return removed;
|
|
}
|
|
|
|
bool RtpDemuxer::OnRtpPacket(const RtpPacketReceived& packet) {
|
|
RtpPacketSinkInterface* sink = ResolveSink(packet);
|
|
if (sink != nullptr) {
|
|
sink->OnRtpPacket(packet);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
RtpPacketSinkInterface* RtpDemuxer::ResolveSink(
|
|
const RtpPacketReceived& packet) {
|
|
// See the BUNDLE spec for high level reference to this algorithm:
|
|
// https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-38#section-10.2
|
|
|
|
// RSID and RRID are routed to the same sinks. If an RSID is specified on a
|
|
// repair packet, it should be ignored and the RRID should be used.
|
|
std::string packet_mid, packet_rsid;
|
|
bool has_mid = use_mid_ && packet.GetExtension<RtpMid>(&packet_mid);
|
|
bool has_rsid = packet.GetExtension<RepairedRtpStreamId>(&packet_rsid);
|
|
if (!has_rsid) {
|
|
has_rsid = packet.GetExtension<RtpStreamId>(&packet_rsid);
|
|
}
|
|
uint32_t ssrc = packet.Ssrc();
|
|
|
|
// The BUNDLE spec says to drop any packets with unknown MIDs, even if the
|
|
// SSRC is known/latched.
|
|
if (has_mid && known_mids_.find(packet_mid) == known_mids_.end()) {
|
|
return nullptr;
|
|
}
|
|
|
|
// Cache information we learn about SSRCs and IDs. We need to do this even if
|
|
// there isn't a rule/sink yet because we might add an MID/RSID rule after
|
|
// learning an MID/RSID<->SSRC association.
|
|
|
|
std::string* mid = nullptr;
|
|
if (has_mid) {
|
|
mid_by_ssrc_[ssrc] = packet_mid;
|
|
mid = &packet_mid;
|
|
} else {
|
|
// If the packet does not include a MID header extension, check if there is
|
|
// a latched MID for the SSRC.
|
|
const auto it = mid_by_ssrc_.find(ssrc);
|
|
if (it != mid_by_ssrc_.end()) {
|
|
mid = &it->second;
|
|
}
|
|
}
|
|
|
|
std::string* rsid = nullptr;
|
|
if (has_rsid) {
|
|
rsid_by_ssrc_[ssrc] = packet_rsid;
|
|
rsid = &packet_rsid;
|
|
} else {
|
|
// If the packet does not include an RRID/RSID header extension, check if
|
|
// there is a latched RSID for the SSRC.
|
|
const auto it = rsid_by_ssrc_.find(ssrc);
|
|
if (it != rsid_by_ssrc_.end()) {
|
|
rsid = &it->second;
|
|
}
|
|
}
|
|
|
|
// If MID and/or RSID is specified, prioritize that for demuxing the packet.
|
|
// The motivation behind the BUNDLE algorithm is that we trust these are used
|
|
// deliberately by senders and are more likely to be correct than SSRC/payload
|
|
// type which are included with every packet.
|
|
// TODO(steveanton): According to the BUNDLE spec, new SSRC mappings are only
|
|
// accepted if the packet's extended sequence number is
|
|
// greater than that of the last SSRC mapping update.
|
|
// https://tools.ietf.org/html/rfc7941#section-4.2.6
|
|
if (mid != nullptr) {
|
|
RtpPacketSinkInterface* sink_by_mid = ResolveSinkByMid(*mid, ssrc);
|
|
if (sink_by_mid != nullptr) {
|
|
return sink_by_mid;
|
|
}
|
|
|
|
// RSID is scoped to a given MID if both are included.
|
|
if (rsid != nullptr) {
|
|
RtpPacketSinkInterface* sink_by_mid_rsid =
|
|
ResolveSinkByMidRsid(*mid, *rsid, ssrc);
|
|
if (sink_by_mid_rsid != nullptr) {
|
|
return sink_by_mid_rsid;
|
|
}
|
|
}
|
|
|
|
// At this point, there is at least one sink added for this MID and an RSID
|
|
// but either the packet does not have an RSID or it is for a different
|
|
// RSID. This falls outside the BUNDLE spec so drop the packet.
|
|
return nullptr;
|
|
}
|
|
|
|
// RSID can be used without MID as long as they are unique.
|
|
if (rsid != nullptr) {
|
|
RtpPacketSinkInterface* sink_by_rsid = ResolveSinkByRsid(*rsid, ssrc);
|
|
if (sink_by_rsid != nullptr) {
|
|
return sink_by_rsid;
|
|
}
|
|
}
|
|
|
|
// We trust signaled SSRC more than payload type which is likely to conflict
|
|
// between streams.
|
|
const auto ssrc_sink_it = sink_by_ssrc_.find(ssrc);
|
|
if (ssrc_sink_it != sink_by_ssrc_.end()) {
|
|
return ssrc_sink_it->second;
|
|
}
|
|
|
|
// Legacy senders will only signal payload type, support that as last resort.
|
|
return ResolveSinkByPayloadType(packet.PayloadType(), ssrc);
|
|
}
|
|
|
|
RtpPacketSinkInterface* RtpDemuxer::ResolveSinkByMid(const std::string& mid,
|
|
uint32_t ssrc) {
|
|
const auto it = sink_by_mid_.find(mid);
|
|
if (it != sink_by_mid_.end()) {
|
|
RtpPacketSinkInterface* sink = it->second;
|
|
AddSsrcSinkBinding(ssrc, sink);
|
|
return sink;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
RtpPacketSinkInterface* RtpDemuxer::ResolveSinkByMidRsid(
|
|
const std::string& mid,
|
|
const std::string& rsid,
|
|
uint32_t ssrc) {
|
|
const auto it = sink_by_mid_and_rsid_.find(std::make_pair(mid, rsid));
|
|
if (it != sink_by_mid_and_rsid_.end()) {
|
|
RtpPacketSinkInterface* sink = it->second;
|
|
AddSsrcSinkBinding(ssrc, sink);
|
|
return sink;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
RtpPacketSinkInterface* RtpDemuxer::ResolveSinkByRsid(const std::string& rsid,
|
|
uint32_t ssrc) {
|
|
const auto it = sink_by_rsid_.find(rsid);
|
|
if (it != sink_by_rsid_.end()) {
|
|
RtpPacketSinkInterface* sink = it->second;
|
|
AddSsrcSinkBinding(ssrc, sink);
|
|
return sink;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
RtpPacketSinkInterface* RtpDemuxer::ResolveSinkByPayloadType(
|
|
uint8_t payload_type,
|
|
uint32_t ssrc) {
|
|
const auto range = sinks_by_pt_.equal_range(payload_type);
|
|
if (range.first != range.second) {
|
|
auto it = range.first;
|
|
const auto end = range.second;
|
|
if (std::next(it) == end) {
|
|
RtpPacketSinkInterface* sink = it->second;
|
|
AddSsrcSinkBinding(ssrc, sink);
|
|
return sink;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
void RtpDemuxer::AddSsrcSinkBinding(uint32_t ssrc,
|
|
RtpPacketSinkInterface* sink) {
|
|
if (sink_by_ssrc_.size() >= kMaxSsrcBindings) {
|
|
RTC_LOG(LS_WARNING) << "New SSRC=" << ssrc
|
|
<< " sink binding ignored; limit of" << kMaxSsrcBindings
|
|
<< " bindings has been reached.";
|
|
return;
|
|
}
|
|
|
|
auto result = sink_by_ssrc_.emplace(ssrc, sink);
|
|
auto it = result.first;
|
|
bool inserted = result.second;
|
|
if (inserted) {
|
|
RTC_LOG(LS_INFO) << "Added sink = " << sink
|
|
<< " binding with SSRC=" << ssrc;
|
|
} else if (it->second != sink) {
|
|
RTC_LOG(LS_INFO) << "Updated sink = " << sink
|
|
<< " binding with SSRC=" << ssrc;
|
|
it->second = sink;
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|