Track pending ICE restarts independently for different media sections.

talk/session/media/mediasession.cc

Index: talk/session/media/mediasession.cc
diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc
index b6f52c2b62155e1a8917e7073eabe1df1e810d9b..8708371a85283a6ad696f7286b983417e1db6b04 100644
--- a/talk/session/media/mediasession.cc
+++ b/talk/session/media/mediasession.cc
@@ -738,6 +738,15 @@ static bool IsRtxCodec(const C& codec) {
   return stricmp(codec.name.c_str(), kRtxCodecName) == 0;
 }
 
+static TransportOptions GetTransportOptions(const MediaSessionOptions& options,
+                                            const std::string& content_name) {
+  auto it = options.transport_options.find(content_name);

[honghaiz3, 2016/02/12 18:21:04]

Perhaps this can be replaced with return options.transport_options[content_name]
and removing this function. 
The downside of [] operation is that it will insert a default value if it is not
found. So it really depends on whether you want to tell the difference between a
default value and "not found".

[Taylor Brandstetter, 2016/02/12 20:43:02]

I can't use the [] operator because the MediaSessionsOptions is const. That's
the main reason why this function is needed.

+  if (it == options.transport_options.end()) {
+    return TransportOptions();
+  }
+  return it->second;
+}
+
 // Create a media content to be offered in a session-initiate,
 // according to the given options.rtcp_mux, options.is_muc,
 // options.streams, codecs, secure_transport, crypto, and streams.  If we don't
@@ -1603,7 +1612,8 @@ bool MediaSessionDescriptionFactory::AddAudioContentForOffer(
   }
 
   desc->AddContent(content_name, NS_JINGLE_RTP, audio.release());
-  if (!AddTransportOffer(content_name, options.audio_transport_options,
+  if (!AddTransportOffer(content_name,
+                         GetTransportOptions(options, content_name),
                          current_description, desc)) {
     return false;
   }
@@ -1663,7 +1673,8 @@ bool MediaSessionDescriptionFactory::AddVideoContentForOffer(
   }
 
   desc->AddContent(content_name, NS_JINGLE_RTP, video.release());
-  if (!AddTransportOffer(content_name, options.video_transport_options,
+  if (!AddTransportOffer(content_name,
+                         GetTransportOptions(options, content_name),
                          current_description, desc)) {
     return false;
   }
@@ -1727,7 +1738,8 @@ bool MediaSessionDescriptionFactory::AddDataContentForOffer(
     SetMediaProtocol(secure_transport, data.get());
     desc->AddContent(content_name, NS_JINGLE_RTP, data.release());
   }
-  if (!AddTransportOffer(content_name, options.data_transport_options,
+  if (!AddTransportOffer(content_name,
+                         GetTransportOptions(options, content_name),
                          current_description, desc)) {
     return false;
   }
@@ -1743,8 +1755,8 @@ bool MediaSessionDescriptionFactory::AddAudioContentForAnswer(
   const ContentInfo* audio_content = GetFirstAudioContent(offer);
 
   scoped_ptr<TransportDescription> audio_transport(CreateTransportAnswer(
-      audio_content->name, offer, options.audio_transport_options,
-      current_description));
+      audio_content->name, offer,
+      GetTransportOptions(options, audio_content->name), current_description));
   if (!audio_transport) {
     return false;
   }
@@ -1801,8 +1813,8 @@ bool MediaSessionDescriptionFactory::AddVideoContentForAnswer(
     SessionDescription* answer) const {
   const ContentInfo* video_content = GetFirstVideoContent(offer);
   scoped_ptr<TransportDescription> video_transport(CreateTransportAnswer(
-      video_content->name, offer, options.video_transport_options,
-      current_description));
+      video_content->name, offer,
+      GetTransportOptions(options, video_content->name), current_description));
   if (!video_transport) {
     return false;
   }
@@ -1856,8 +1868,8 @@ bool MediaSessionDescriptionFactory::AddDataContentForAnswer(
     SessionDescription* answer) const {
   const ContentInfo* data_content = GetFirstDataContent(offer);
   scoped_ptr<TransportDescription> data_transport(CreateTransportAnswer(
-      data_content->name, offer, options.data_transport_options,
-      current_description));
+      data_content->name, offer,
+      GetTransportOptions(options, data_content->name), current_description));
   if (!data_transport) {
     return false;
   }
@@ -1925,15 +1937,15 @@ bool IsDataContent(const ContentInfo* content) {
   return IsMediaContentOfType(content, MEDIA_TYPE_DATA);
 }
 
-static const ContentInfo* GetFirstMediaContent(const ContentInfos& contents,
-                                               MediaType media_type) {
+const ContentInfo* GetFirstMediaContent(const ContentInfos& contents,
+                                        MediaType media_type) {
   for (ContentInfos::const_iterator content = contents.begin();
        content != contents.end(); content++) {
     if (IsMediaContentOfType(&*content, media_type)) {
       return &*content;
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 const ContentInfo* GetFirstAudioContent(const ContentInfos& contents) {
@@ -1950,8 +1962,9 @@ const ContentInfo* GetFirstDataContent(const ContentInfos& contents) {
 
 static const ContentInfo* GetFirstMediaContent(const SessionDescription* sdesc,
                                                MediaType media_type) {
-  if (sdesc == NULL)
-    return NULL;
+  if (sdesc == nullptr) {
+    return nullptr;
+  }
 
   return GetFirstMediaContent(sdesc->contents(), media_type);
 }