Remove candidates when doing continual gathering

talk/app/webrtc/webrtcsdp.cc

 /*
  * libjingle
  * Copyright 2011 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 151 matching lines @@
 // a=sctp-port
 static const char kAttributeSctpPort[] = "sctp-port";
 
 // Experimental flags
 static const char kAttributeXGoogleFlag[] = "x-google-flag";
 static const char kValueConference[] = "conference";
 
 // Candidate
 static const char kCandidateHost[] = "host";
 static const char kCandidateSrflx[] = "srflx";
-// TODO: How to map the prflx with circket candidate type
-// static const char kCandidatePrflx[] = "prflx";
+static const char kCandidatePrflx[] = "prflx";
 static const char kCandidateRelay[] = "relay";
 static const char kTcpCandidateType[] = "tcptype";
 
 static const char kSdpDelimiterEqual = '=';
 static const char kSdpDelimiterSpace = ' ';
 static const char kSdpDelimiterColon = ':';
 static const char kSdpDelimiterSemicolon = ';';
 static const char kSdpDelimiterSlash = '/';
 static const char kNewLine = '\n';
 static const char kReturn = '\r';
@@ skipping 838 matching lines @@
   }
 
   std::string candidate_type;
   const std::string& type = fields[7];
   if (type == kCandidateHost) {
     candidate_type = cricket::LOCAL_PORT_TYPE;
   } else if (type == kCandidateSrflx) {
     candidate_type = cricket::STUN_PORT_TYPE;
   } else if (type == kCandidateRelay) {
     candidate_type = cricket::RELAY_PORT_TYPE;
+  } else if (type == kCandidatePrflx) {
+    candidate_type = cricket::PRFLX_PORT_TYPE;
   } else {
     return ParseFailed(first_line, "Unsupported candidate type.", error);
   }
 
   size_t current_position = expected_min_fields;
   SocketAddress related_address;
   // The 2 optional fields for related address
   // [raddr <connection-address>] [rport <port>]
   if (fields.size() >= (current_position + 2) &&
       fields[current_position] == kAttributeCandidateRaddr) {
@@ skipping 692 matching lines @@
     // [raddr <connection-address>] [rport <port>]
     // *(SP extension-att-name SP extension-att-value)
     std::string type;
     // Map the cricket candidate type to "host" / "srflx" / "prflx" / "relay"
     if (it->type() == cricket::LOCAL_PORT_TYPE) {
       type = kCandidateHost;
     } else if (it->type() == cricket::STUN_PORT_TYPE) {
       type = kCandidateSrflx;
     } else if (it->type() == cricket::RELAY_PORT_TYPE) {
       type = kCandidateRelay;
+    } else if (it->type() == cricket::PRFLX_PORT_TYPE) {
+      type = kCandidatePrflx;
+      // Peer reflexive candidate should only be signaled with priority 0 for
+      // being removed.
+      ASSERT(it->priority() == 0);
     } else {
       ASSERT(false);
       // Never write out candidates if we don't know the type.
       continue;
     }
 
     InitAttrLine(kAttributeCandidate, &os);
     os << kSdpDelimiterColon
        << it->foundation() << " "
        << it->component() << " "
@@ skipping 1320 matching lines @@
     UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
         media_desc, payload_type, feedback_param);
   } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
     UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
         media_desc, payload_type, feedback_param);
   }
   return true;
 }
 
 }  // namespace webrtc