Add support for FEC-FR semantics in StreamParams.

webrtc/media/base/streamparams.h

Index: webrtc/media/base/streamparams.h
diff --git a/webrtc/media/base/streamparams.h b/webrtc/media/base/streamparams.h
index 5b9d7bd2ef23e518305a3746c522663f68b170a1..a2d48c51784e209fa78aab4d17ef8d45b7a758e2 100644
--- a/webrtc/media/base/streamparams.h
+++ b/webrtc/media/base/streamparams.h
@@ -37,6 +37,7 @@
 namespace cricket {
 
 extern const char kFecSsrcGroupSemantics[];
+extern const char kFecFrSsrcGroupSemantics[];
 extern const char kFidSsrcGroupSemantics[];
 extern const char kSimSsrcGroupSemantics[];
 
@@ -112,16 +113,28 @@ struct StreamParams {
 
   // Convenience function to add an FID ssrc for a primary_ssrc
   // that's already been added.
-  inline bool AddFidSsrc(uint32_t primary_ssrc, uint32_t fid_ssrc) {
+  bool AddFidSsrc(uint32_t primary_ssrc, uint32_t fid_ssrc) {
     return AddSecondarySsrc(kFidSsrcGroupSemantics, primary_ssrc, fid_ssrc);
   }
 
   // Convenience function to lookup the FID ssrc for a primary_ssrc.
   // Returns false if primary_ssrc not found or FID not defined for it.
-  inline bool GetFidSsrc(uint32_t primary_ssrc, uint32_t* fid_ssrc) const {
+  bool GetFidSsrc(uint32_t primary_ssrc, uint32_t* fid_ssrc) const {
     return GetSecondarySsrc(kFidSsrcGroupSemantics, primary_ssrc, fid_ssrc);
   }
 
+  // Convenience function to add an FEC-FR ssrc for a primary_ssrc
+  // that's already been added.
+  bool AddFecFrSsrc(uint32_t primary_ssrc, uint32_t fecfr_ssrc) {
+    return AddSecondarySsrc(kFecFrSsrcGroupSemantics, primary_ssrc, fecfr_ssrc);
+  }
+
+  // Convenience function to lookup the FEC-FR ssrc for a primary_ssrc.
+  // Returns false if primary_ssrc not found or FEC-FR not defined for it.
+  bool GetFecFrSsrc(uint32_t primary_ssrc, uint32_t* fecfr_ssrc) const {
+    return GetSecondarySsrc(kFecFrSsrcGroupSemantics, primary_ssrc, fecfr_ssrc);
+  }
+
   // Convenience to get all the SIM SSRCs if there are SIM ssrcs, or
   // the first SSRC otherwise.
   void GetPrimarySsrcs(std::vector<uint32_t>* ssrcs) const;
@@ -289,8 +302,8 @@ inline bool RemoveStreamByIds(StreamParamsVec* streams,
 }
 
 // Checks if |sp| defines parameters for a single primary stream. There may
-// be an RTX stream associated with the primary stream. Leaving as non-static so
-// we can test this function.
+// be an RTX stream or a FlexFEC stream (or both) associated with the primary
+// stream. Leaving as non-static so we can test this function.
 bool IsOneSsrcStream(const StreamParams& sp);
 
 // Checks if |sp| defines parameters for one Simulcast stream. There may be RTX