[merge to M104] sdp: temporarily relax clockrate requirements for statically assigned payload types
to allow for downstream users to upgrade.
BUG=chromium:1338902
(cherry picked from commit 62c20f305ef513b3052c8f000e115a93c524ae1c)
No-Try: True
Change-Id: If6b56ab63f7859c13e9ebc70326e1088e5dfff1a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268141
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Original-Commit-Position: refs/heads/main@{#37475}
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268142
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Philipp Hancke <philipp.hancke@googlemail.com>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/branch-heads/5112@{#6}
Cr-Branched-From: a976a871159f85f975fbd6f170d0a8f00a4aee49-refs/heads/main@{#37168}
diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc
index 8e45524..4d7cee7 100644
--- a/pc/webrtc_sdp.cc
+++ b/pc/webrtc_sdp.cc
@@ -3633,9 +3633,9 @@
AudioContentDescription* audio_desc = media_desc->as_audio();
for (const cricket::AudioCodec& existing_codec : audio_desc->codecs()) {
+ // TODO(crbug.com/1338902) re-add check for clockrate.
if (!existing_codec.name.empty() && payload_type == existing_codec.id &&
(!absl::EqualsIgnoreCase(encoding_name, existing_codec.name) ||
- clock_rate != existing_codec.clockrate ||
channels != existing_codec.channels)) {
rtc::StringBuilder description;
description
diff --git a/pc/webrtc_sdp_unittest.cc b/pc/webrtc_sdp_unittest.cc
index 02f990b..7880af0 100644
--- a/pc/webrtc_sdp_unittest.cc
+++ b/pc/webrtc_sdp_unittest.cc
@@ -4665,11 +4665,10 @@
"s=-\r\n"
"t=0 0\r\n"
"m=audio 49232 RTP/AVP 108\r\n"
- // Same name but different payload type.
"a=rtpmap:108 ISAC/16000\r\n"
- "a=rtpmap:108 ISAC/32000\r\n";
+ "a=rtpmap:108 G711/16000\r\n";
- ExpectParseFailure(sdp, "a=rtpmap:108 ISAC/32000");
+ ExpectParseFailure(sdp, "a=rtpmap:108 G711/16000");
}
TEST_F(WebRtcSdpTest, DuplicateVideoRtpmapWithConflict) {
