From c501f30333ce8b46a92b75a6bf75733ddb0e9741 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Fri, 8 Jul 2022 18:19:14 +0200 Subject: [PATCH] sdp: temporarily relax channel requirements for statically assigned payload types to allow for downstream users to upgrade. BUG=chromium:1338902 Change-Id: Ie1205ad2c9c1be3f4ed8e133b1a5e54afd04ebd9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268193 Commit-Queue: Philipp Hancke Reviewed-by: Tomas Gunnarsson Cr-Commit-Position: refs/heads/main@{#37501} --- pc/webrtc_sdp.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc index ae4e58d9f4..39b16901a1 100644 --- a/pc/webrtc_sdp.cc +++ b/pc/webrtc_sdp.cc @@ -3636,10 +3636,10 @@ bool ParseRtpmapAttribute(absl::string_view line, 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. + // TODO(crbug.com/1338902) re-add checks for clockrate and number of + // channels. if (!existing_codec.name.empty() && payload_type == existing_codec.id && - (!absl::EqualsIgnoreCase(encoding_name, existing_codec.name) || - channels != existing_codec.channels)) { + (!absl::EqualsIgnoreCase(encoding_name, existing_codec.name))) { rtc::StringBuilder description; description << "Duplicate "