commit 60c01cc45b48a364f809258a84d493b52a3c8935
author Philipp Hancke <philipp.hancke@googlemail.com> Mon Nov 15 14:54:58 2021 +0100
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Nov 15 15:48:58 2021 +0000
tree fba8649ee2c573b7a29d8bc825eb1e4c379e0513
parent 62bb58f3eeb3ede4c707d6a8fda26e0c637b3e28

setCodecPreferences: dont insert red codec twice

this could happen if setCodecPreferences is used to prefer
red over opus as it is done for red+opus.

BUG=webrtc:13287

Change-Id: I3d61cd8f1a364572bc531a75dcc239c3919138cc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/237800
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#35344}

pc/media_session.cc

diff --git a/pc/media_session.cc b/pc/media_session.cc
index c64924a..426eadc 100644
--- a/pc/media_session.cc
+++ b/pc/media_session.cc
@@ -1084,6 +1084,9 @@
                 break;
               }
             } else if (IsRedCodec(codec)) {
+              // For RED, do not insert the codec again if it was already
+              // inserted. audio/red for opus gets enabled by having RED before
+              // the primary codec.
               const auto fmtp =
                   codec.params.find(cricket::kCodecParamNotInNameValueFormat);
               if (fmtp != codec.params.end()) {
@@ -1091,7 +1094,10 @@
                 rtc::split(fmtp->second, '/', &redundant_payloads);
                 if (redundant_payloads.size() > 0 &&
                     redundant_payloads[0] == id) {
-                  filtered_codecs.push_back(codec);
+                  if (std::find(filtered_codecs.begin(), filtered_codecs.end(),
+                                codec) == filtered_codecs.end()) {
+                    filtered_codecs.push_back(codec);
+                  }
                   break;
                 }
               }