commit 0776415a412c82bb698ef60f7a434be9f1360d50
author Philipp Hancke <phancke@microsoft.com> Mon Jun 26 10:27:31 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 26 14:55:48 2023
tree 82a8fb7d57432f08fbf2e3f8fb6689513fd60521
parent 48a2af35e14022825cc0ca684ee061c8fc28c8b6

Generalize stream parameter primary/secondary ssrc checks

to ensure consistency for both FID and FEC-FR ssrc-groups.

BUG=chromium:1454860

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

media/base/test_utils.cc

diff --git a/media/base/test_utils.cc b/media/base/test_utils.cc
index a6d5f61..1b28873 100644
--- a/media/base/test_utils.cc
+++ b/media/base/test_utils.cc
@@ -35,26 +35,20 @@
     const std::vector<uint32_t>& rtx_ssrcs) {
   cricket::StreamParams sp = CreateSimStreamParams(cname, ssrcs);
   for (size_t i = 0; i < ssrcs.size(); ++i) {
-    sp.ssrcs.push_back(rtx_ssrcs[i]);
-    std::vector<uint32_t> fid_ssrcs;
-    fid_ssrcs.push_back(ssrcs[i]);
-    fid_ssrcs.push_back(rtx_ssrcs[i]);
-    cricket::SsrcGroup fid_group(cricket::kFidSsrcGroupSemantics, fid_ssrcs);
-    sp.ssrc_groups.push_back(fid_group);
+    sp.AddFidSsrc(ssrcs[i], rtx_ssrcs[i]);
   }
   return sp;
 }
 
+// There should be one fec ssrc per ssrc.
 cricket::StreamParams CreatePrimaryWithFecFrStreamParams(
     const std::string& cname,
     uint32_t primary_ssrc,
     uint32_t flexfec_ssrc) {
   cricket::StreamParams sp;
-  cricket::SsrcGroup sg(cricket::kFecFrSsrcGroupSemantics,
-                        {primary_ssrc, flexfec_ssrc});
   sp.ssrcs = {primary_ssrc};
-  sp.ssrc_groups.push_back(sg);
   sp.cname = cname;
+  sp.AddFecFrSsrc(primary_ssrc, flexfec_ssrc);
   return sp;
 }