commit 9932a1e95b99eac258f685425e73afe94d406798
parent 463e4c21877e8b9f3c85e53e17e77ad339b99c4c
Author: Michael Froman <mfroman@mozilla.com>
Date: Wed, 15 Oct 2025 11:52:44 -0500
Bug 1993083 - Vendor libwebrtc from 847fe79059
Upstream commit: https://webrtc.googlesource.com/src/+/847fe7905954f3ae883de2936415ff567aa9039b
[M140] sdp munging: do not misdetect rtp attributes on datachannel
rtcp-mux and rtcp-rsize are unconditionally set for datachannel
but since they are not serialized in the SDP they are not parsed.
This leads the munging detector to misclassify this.
a unit test is added as a separate CL for easier backmerging.
(cherry picked from commit 602b06b1125ea4d107fbfbda7d314b4157c4c74b)
Bug: webrtc:414284082,chromium:40567530
Fixed: chromium:439807581
Change-Id: I4ebb2ad5062ea42fc47a314ed929de42f91bbea7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/404740
Commit-Queue: Philipp Hancke <phancke@meta.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Original-Commit-Position: refs/heads/main@{#45357}
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/405281
Cr-Commit-Position: refs/branch-heads/7339@{#1}
Cr-Branched-From: 9bd64751d9b3b35a820cb72c9029993e218146a1-refs/heads/main@{#45270}
Diffstat:
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T16:51:34.887745+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T16:52:37.142701+00:00.
# base of lastest vendoring
-9bd64751d9
+847fe79059
diff --git a/third_party/libwebrtc/pc/sdp_munging_detector.cc b/third_party/libwebrtc/pc/sdp_munging_detector.cc
@@ -424,6 +424,12 @@ SdpMungingType DetermineSdpMungingType(
}
// Validate video and audio contents.
MediaType media_type = last_created_media_description->type();
+ bool is_rtp =
+ media_type == MediaType::AUDIO || media_type == MediaType::VIDEO;
+ if (!is_rtp) {
+ // The checks that follow only apply for RTP-based contents.
+ continue;
+ }
if (media_type == MediaType::VIDEO) {
type = DetermineVideoSdpMungingType(last_created_media_description,
media_description_to_set);
