Fixing some issues with ICE restart signaling.

talk/session/media/mediasession.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 128 matching lines @@
   DataChannelType data_channel_type;
   bool is_muc;
   bool vad_enabled;
   bool rtcp_mux_enabled;
   bool bundle_enabled;
   // bps. -1 == auto.
   int video_bandwidth;
   int data_bandwidth;
   TransportOptions transport_options;
 
+  bool audio_ice_restart = false;
+  bool video_ice_restart = false;
+  bool data_ice_restart = false;
+
   struct Stream {
     Stream(MediaType type,
            const std::string& id,
            const std::string& sync_label,
            int num_sim_layers)
         : type(type), id(id), sync_label(sync_label),
           num_sim_layers(num_sim_layers) {
     }
     MediaType type;
     std::string id;
@@ skipping 287 matching lines @@
         const SessionDescription* current_description) const;
 
  private:
   void GetCodecsToOffer(const SessionDescription* current_description,
                         AudioCodecs* audio_codecs,
                         VideoCodecs* video_codecs,
                         DataCodecs* data_codecs) const;
   void GetRtpHdrExtsToOffer(const SessionDescription* current_description,
                             RtpHeaderExtensions* audio_extensions,
                             RtpHeaderExtensions* video_extensions) const;
-  bool AddTransportOffer(
-      const std::string& content_name,
-      const TransportOptions& transport_options,
-      const SessionDescription* current_desc,
-      SessionDescription* offer) const;
+  bool AddTransportOffer(const std::string& content_name,
+                         const TransportOptions& transport_options,
+                         bool ice_restart,
+                         const SessionDescription* current_desc,
+                         SessionDescription* offer) const;
 
   TransportDescription* CreateTransportAnswer(
       const std::string& content_name,
       const SessionDescription* offer_desc,
       const TransportOptions& transport_options,
+      bool ice_restart,
       const SessionDescription* current_desc) const;
 
   bool AddTransportAnswer(
       const std::string& content_name,
       const TransportDescription& transport_desc,
       SessionDescription* answer_desc) const;
 
   // Helpers for adding media contents to the SessionDescription. Returns true
   // it succeeds or the media content is not needed, or false if there is any
   // error.
@@ skipping 51 matching lines @@
   bool add_legacy_;
   std::string lang_;
   const TransportDescriptionFactory* transport_desc_factory_;
 };
 
 // Convenience functions.
 bool IsMediaContent(const ContentInfo* content);
 bool IsAudioContent(const ContentInfo* content);
 bool IsVideoContent(const ContentInfo* content);
 bool IsDataContent(const ContentInfo* content);
+const ContentInfo* GetFirstMediaContent(const ContentInfos& contents,
+                                        MediaType media_type);
 const ContentInfo* GetFirstAudioContent(const ContentInfos& contents);
 const ContentInfo* GetFirstVideoContent(const ContentInfos& contents);
 const ContentInfo* GetFirstDataContent(const ContentInfos& contents);
 const ContentInfo* GetFirstAudioContent(const SessionDescription* sdesc);
 const ContentInfo* GetFirstVideoContent(const SessionDescription* sdesc);
 const ContentInfo* GetFirstDataContent(const SessionDescription* sdesc);
 const AudioContentDescription* GetFirstAudioContentDescription(
     const SessionDescription* sdesc);
 const VideoContentDescription* GetFirstVideoContentDescription(
     const SessionDescription* sdesc);
 const DataContentDescription* GetFirstDataContentDescription(
     const SessionDescription* sdesc);
 
 void GetSupportedAudioCryptoSuites(std::vector<std::string>* crypto_suites);
 void GetSupportedVideoCryptoSuites(std::vector<std::string>* crypto_suites);
 void GetSupportedDataCryptoSuites(std::vector<std::string>* crypto_suites);
 void GetDefaultSrtpCryptoSuiteNames(std::vector<std::string>* crypto_suites);
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_MEDIASESSION_H_