Add support for FEC-FR semantics in StreamParams.

webrtc/media/base/streamparams_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 110 matching lines @@
   uint32_t fid_ssrc;
 
   cricket::StreamParams sp = cricket::StreamParams::CreateLegacy(1);
   EXPECT_FALSE(sp.AddFidSsrc(10, 20));
   EXPECT_TRUE(sp.AddFidSsrc(1, 2));
   EXPECT_TRUE(sp.GetFidSsrc(1, &fid_ssrc));
   EXPECT_EQ(2u, fid_ssrc);
   EXPECT_FALSE(sp.GetFidSsrc(15, &fid_ssrc));
 
   sp.add_ssrc(20);
-  sp.AddFidSsrc(20, 30);
+  EXPECT_TRUE(sp.AddFidSsrc(20, 30));
   EXPECT_TRUE(sp.GetFidSsrc(20, &fid_ssrc));
   EXPECT_EQ(30u, fid_ssrc);
 
   // Manually create SsrcGroup to test bounds-checking
   // in GetSecondarySsrc. We construct an invalid StreamParams
   // for this.
   std::vector<uint32_t> fid_vector;
   fid_vector.push_back(13);
   cricket::SsrcGroup invalid_fid_group(cricket::kFidSsrcGroupSemantics,
                                         fid_vector);
@@ skipping 28 matching lines @@
   sp.GetFidSsrcs(primary_ssrcs, &fid_ssrcs);
   ASSERT_EQ(3u, primary_ssrcs.size());
   EXPECT_EQ(1u, primary_ssrcs[0]);
   EXPECT_EQ(2u, primary_ssrcs[1]);
   EXPECT_EQ(3u, primary_ssrcs[2]);
   ASSERT_EQ(2u, fid_ssrcs.size());
   EXPECT_EQ(10u, fid_ssrcs[0]);
   EXPECT_EQ(20u, fid_ssrcs[1]);
 }
 
+TEST(StreamParams, FecFrFunctions) {
+  uint32_t fecfr_ssrc;
+
+  cricket::StreamParams sp = cricket::StreamParams::CreateLegacy(1);
+  EXPECT_FALSE(sp.AddFecFrSsrc(10, 20));
+  EXPECT_TRUE(sp.AddFecFrSsrc(1, 2));
+  EXPECT_TRUE(sp.GetFecFrSsrc(1, &fecfr_ssrc));
+  EXPECT_EQ(2u, fecfr_ssrc);
+  EXPECT_FALSE(sp.GetFecFrSsrc(15, &fecfr_ssrc));
+
+  sp.add_ssrc(20);
+  EXPECT_TRUE(sp.AddFecFrSsrc(20, 30));
+  EXPECT_TRUE(sp.GetFecFrSsrc(20, &fecfr_ssrc));
+  EXPECT_EQ(30u, fecfr_ssrc);
+
+  // Manually create SsrcGroup to test bounds-checking
+  // in GetSecondarySsrc. We construct an invalid StreamParams
+  // for this.
+  std::vector<uint32_t> fecfr_vector;
+  fecfr_vector.push_back(13);
+  cricket::SsrcGroup invalid_fecfr_group(cricket::kFecFrSsrcGroupSemantics,
+                                         fecfr_vector);
+  cricket::StreamParams sp_invalid;
+  sp_invalid.add_ssrc(13);
+  sp_invalid.ssrc_groups.push_back(invalid_fecfr_group);
+  EXPECT_FALSE(sp_invalid.GetFecFrSsrc(13, &fecfr_ssrc));
+}
+
 TEST(StreamParams, ToString) {
   cricket::StreamParams sp =
       CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2));
   EXPECT_STREQ("{ssrcs:[1,2];ssrc_groups:{semantics:XYZ;ssrcs:[1,2]};}",
                sp.ToString().c_str());
 }
 
-
 TEST(StreamParams, TestIsOneSsrcStream_LegacyStream) {
   EXPECT_TRUE(
       cricket::IsOneSsrcStream(cricket::StreamParams::CreateLegacy(13)));
 }
 
 TEST(StreamParams, TestIsOneSsrcStream_SingleRtxStream) {
   cricket::StreamParams stream;
   stream.add_ssrc(13);
   EXPECT_TRUE(stream.AddFidSsrc(13, 14));
   EXPECT_TRUE(cricket::IsOneSsrcStream(stream));
 }
 
+TEST(StreamParams, TestIsOneSsrcStream_SingleFlexfecStream) {
+  cricket::StreamParams stream;
+  stream.add_ssrc(13);
+  EXPECT_TRUE(stream.AddFecFrSsrc(13, 14));
+  EXPECT_TRUE(cricket::IsOneSsrcStream(stream));
+}
+
+TEST(StreamParams, TestIsOneSsrcStream_SingleFlexfecAndRtxStream) {
+  cricket::StreamParams stream;
+  stream.add_ssrc(13);
+  EXPECT_TRUE(stream.AddFecFrSsrc(13, 14));
+  EXPECT_TRUE(stream.AddFidSsrc(13, 15));
+  EXPECT_TRUE(cricket::IsOneSsrcStream(stream));
+}
+
 TEST(StreamParams, TestIsOneSsrcStream_SimulcastStream) {
   EXPECT_FALSE(cricket::IsOneSsrcStream(
       cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs2))));
   EXPECT_FALSE(cricket::IsOneSsrcStream(
       cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs3))));
 }
 
 TEST(StreamParams, TestIsOneSsrcStream_SimRtxStream) {
   cricket::StreamParams stream =
       cricket::CreateSimWithRtxStreamParams("cname",
@@ skipping 49 matching lines @@
   cricket::StreamParams stream3 =
       cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs2));
   std::vector<uint32_t> sim_ssrcs = MAKE_VECTOR(kRtxSsrcs3);
   cricket::SsrcGroup sg(cricket::kSimSsrcGroupSemantics, sim_ssrcs);
   for (size_t i = 0; i < sim_ssrcs.size(); i++) {
     stream3.add_ssrc(sim_ssrcs[i]);
   }
   stream3.ssrc_groups.push_back(sg);
   EXPECT_FALSE(cricket::IsSimulcastStream(stream3));
 }