commit b9405c4748cf32b1bc85d74fa3f48f84498409a5
author Philipp Hancke <phancke@microsoft.com> Thu Dec 07 17:00:47 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jan 09 13:09:59 2024
tree d5d8db336b6815309b83736c078c8c95e4a8e1cf
parent 0a96289bcb3fec08e64d1b427131c3464b74c36b

Fix list of resiliency mechanisms in setCodecPreferences

Add ulpfec and flexfec to list of resiliency mechanisms taken
into account and in general exclude Comfort Noise (CN) from media
codecs.

Also introduce RtpCodecCapability::IsMediaCodec & ::IsResiliencyCodec
behaving like the MediaCodec methods.

BUG=webrtc:15396

Change-Id: I79041898928190bfdd33a06d8f6975d7556c46b1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/330424
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41485}

api/BUILD.gn

diff --git a/api/BUILD.gn b/api/BUILD.gn
index d92962c..6cec297 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -508,6 +508,7 @@
     ":array_view",
     ":priority",
     ":rtp_transceiver_direction",
+    "../media:media_constants",
     "../rtc_base:checks",
     "../rtc_base:stringutils",
     "../rtc_base/system:rtc_export",

api/rtp_parameters.cc

diff --git a/api/rtp_parameters.cc b/api/rtp_parameters.cc
index 54132bc..3ff4b58 100644
--- a/api/rtp_parameters.cc
+++ b/api/rtp_parameters.cc
@@ -15,6 +15,7 @@
 #include <utility>
 
 #include "api/array_view.h"
+#include "media/base/media_constants.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
@@ -47,6 +48,14 @@
 RtpCodec::RtpCodec() = default;
 RtpCodec::RtpCodec(const RtpCodec&) = default;
 RtpCodec::~RtpCodec() = default;
+bool RtpCodec::IsResiliencyCodec() const {
+  return name == cricket::kRtxCodecName || name == cricket::kRedCodecName ||
+         name == cricket::kUlpfecCodecName ||
+         name == cricket::kFlexfecCodecName;
+}
+bool RtpCodec::IsMediaCodec() const {
+  return !IsResiliencyCodec() && name != cricket::kComfortNoiseCodecName;
+}
 RtpCodecCapability::RtpCodecCapability() = default;
 RtpCodecCapability::~RtpCodecCapability() = default;
 

api/rtp_parameters.h

diff --git a/api/rtp_parameters.h b/api/rtp_parameters.h
index e78cc66..025817c 100644
--- a/api/rtp_parameters.h
+++ b/api/rtp_parameters.h
@@ -167,6 +167,8 @@
            parameters == o.parameters;
   }
   bool operator!=(const RtpCodec& o) const { return !(*this == o); }
+  bool IsResiliencyCodec() const;
+  bool IsMediaCodec() const;
 };
 
 // RtpCodecCapability is to RtpCodecParameters as RtpCapabilities is to