06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Tue, 27 Mar 2018 15:43:00 -0400
|
|
Subject: Bug 1376873 - Disable Mid support in RtpDemuxer; r=mjf
|
|
|
|
The only use of Mid in the current webrtc.org code is in the unit tests.
|
|
RtpStreamReceiverController only allows adding sinks using SSRCs. Because
|
|
of this, we'll end up dropping packets in the RtpDemuxer with the current
|
|
code as none of our Mids will be recognized.
|
|
|
|
Tip of webrtc.org fully supports using Mids, so we'll be able to enable this
|
|
code again after the next update.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D7442
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b3ba8452e77105c72f6ddbc49cbe5a53dbea1507
|
|
---
|
|
call/rtp_demuxer.cc | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/call/rtp_demuxer.cc b/call/rtp_demuxer.cc
|
|
index b27661aced..70e2132b98 100644
|
|
--- a/call/rtp_demuxer.cc
|
|
+++ b/call/rtp_demuxer.cc
|
|
@@ -282,13 +282,17 @@ RtpPacketSinkInterface* RtpDemuxer::ResolveSink(
|
|
// 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_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();
|
|
|
|
+ // Mid support is half-baked in branch 64. RtpStreamReceiverController only
|
|
+ // supports adding sinks by ssrc, so our mids will never show up in
|
|
+ // known_mids_, causing us to drop packets here.
|
|
+#if 0
|
|
// 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()) {
|
|
@@ -362,6 +366,7 @@ RtpPacketSinkInterface* RtpDemuxer::ResolveSink(
|
|
}
|
|
}
|
|
|
|
+#endif
|
|
// 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);
|