Track pending ICE restarts independently for different media sections.

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 13 matching lines @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 // Types and classes used in media session descriptions.
 
 #ifndef TALK_SESSION_MEDIA_MEDIASESSION_H_
 #define TALK_SESSION_MEDIA_MEDIASESSION_H_
 
 #include <algorithm>
+#include <map>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/cryptoparams.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/mediaengine.h"  // For DataChannelType
 #include "webrtc/media/base/streamparams.h"
@@ skipping 97 matching lines @@
   bool recv_audio;
   bool recv_video;
   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 audio_transport_options;
-  TransportOptions video_transport_options;
-  TransportOptions data_transport_options;
+  // content name ("mid") => options.
+  std::map<std::string, TransportOptions> transport_options;
 
   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;
@@ skipping 365 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<int>* crypto_suites);
 void GetSupportedVideoCryptoSuites(std::vector<int>* crypto_suites);
 void GetSupportedDataCryptoSuites(std::vector<int>* crypto_suites);
 void GetDefaultSrtpCryptoSuites(std::vector<int>* crypto_suites);
 void GetSupportedAudioCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 void GetSupportedVideoCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 void GetSupportedDataCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 void GetDefaultSrtpCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_MEDIASESSION_H_