commit ae566cd8315e53f3084b471507a696a8287bf338
author Philipp Hancke <philipp.hancke@googlemail.com> Thu Sep 30 14:56:35 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Oct 01 13:02:30 2021
tree 0e0a13df7ca5fded4a79a1eb584d4d1aee3e4df2
parent 1d4aa36988d9557bde0d36f14308fbf8d066be07

audio/red: provide default fmtp line

otherwise the generated codec won't match the preassigned codec
and red will use 96 as payload type, increasing the payload type
congestion in the upper range.

BUG=webrtc:11640

Change-Id: I466ed6d4e025ef116f3099e85855e10493408ab1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/233560
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35130}

media/engine/payload_type_mapper.cc

diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc
index cbc0a53..c63d1d7 100644
--- a/media/engine/payload_type_mapper.cc
+++ b/media/engine/payload_type_mapper.cc
@@ -73,7 +73,12 @@
               {kCodecParamUseInbandFec, kParamValueTrue}}},
             111},
            // RED for opus is assigned in the lower range, starting at the top.
-           {{kRedCodecName, 48000, 2}, 63},
+           // Note that the FMTP refers to the opus payload type.
+           {{kRedCodecName,
+             48000,
+             2,
+             {{kCodecParamNotInNameValueFormat, "111/111"}}},
+            63},
            // TODO(solenberg): Remove the hard coded 16k,32k,48k DTMF once we
            // assign payload types dynamically for send side as well.
            {{kDtmfCodecName, 48000, 1}, 110},

media/engine/payload_type_mapper_unittest.cc

diff --git a/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc
index 9c29827..2d93724 100644
--- a/media/engine/payload_type_mapper_unittest.cc
+++ b/media/engine/payload_type_mapper_unittest.cc
@@ -58,7 +58,8 @@
                       48000,
                       2,
                       {{"minptime", "10"}, {"useinbandfec", "1"}}}));
-  EXPECT_EQ(63, mapper_.FindMappingFor({kRedCodecName, 48000, 2}));
+  EXPECT_EQ(
+      63, mapper_.FindMappingFor({kRedCodecName, 48000, 2, {{"", "111/111"}}}));
   // TODO(solenberg): Remove 16k, 32k, 48k DTMF checks once these payload types
   // are dynamically assigned.
   EXPECT_EQ(110, mapper_.FindMappingFor({kDtmfCodecName, 48000, 1}));