commit 2ce9e01b8d3e4615afb26733f86d148c1d595a31
author Philipp Hancke <philipp.hancke@googlemail.com> Fri Jul 08 16:19:14 2022
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jul 14 08:32:27 2022
tree 901e5ae85bbe847c30ea45a03627d5829691ad02
parent 701c8ff957b2c711819497469f317ffded5c1ef0

[merge to M104] sdp: temporarily relax channel requirements for statically assigned payload types

to allow for downstream users to upgrade.

BUG=chromium:1338902

(cherry picked from commit c501f30333ce8b46a92b75a6bf75733ddb0e9741)

No-Try: true
Change-Id: Ie1205ad2c9c1be3f4ed8e133b1a5e54afd04ebd9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268193
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Original-Commit-Position: refs/heads/main@{#37501}
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268469
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/branch-heads/5112@{#7}
Cr-Branched-From: a976a871159f85f975fbd6f170d0a8f00a4aee49-refs/heads/main@{#37168}

pc/webrtc_sdp.cc

diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc
index 4d7cee7..df3fd41 100644
--- a/pc/webrtc_sdp.cc
+++ b/pc/webrtc_sdp.cc
@@ -3633,10 +3633,10 @@
 
     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 "