zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdp: temporarily relax channel requirements for statically assigned payload types

Browse Source 
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 <philipp.hancke@googlemail.com>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37501}
This commit is contained in:
Philipp Hancke
2022-07-08 18:19:14 +02:00
committed by WebRTC LUCI CQ
parent 4058b33eaf
commit c501f30333
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pc/webrtc_sdp.cc
View File

@ -3636,10 +3636,10 @@ bool ParseRtpmapAttribute(absl::string_view line,
AudioContentDescription* audio_desc = media_desc->as_audio(); AudioContentDescription* audio_desc = media_desc->as_audio();
for (const cricket::AudioCodec& existing_codec : audio_desc->codecs()) { 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 && if (!existing_codec.name.empty() && payload_type == existing_codec.id &&
(!absl::EqualsIgnoreCase(encoding_name, existing_codec.name) || (!absl::EqualsIgnoreCase(encoding_name, existing_codec.name))) {
channels != existing_codec.channels)) {
rtc::StringBuilder description; rtc::StringBuilder description;
description description
<< "Duplicate " << "Duplicate "