| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/api/jsepicecandidate.h" | 11 #include "webrtc/api/jsepicecandidate.h" |
| 12 | 12 |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "webrtc/base/stringencode.h" | |
| 16 #include "webrtc/pc/webrtcsdp.h" | 15 #include "webrtc/pc/webrtcsdp.h" |
| 16 #include "webrtc/rtc_base/stringencode.h" |
| 17 | 17 |
| 18 namespace webrtc { | 18 namespace webrtc { |
| 19 | 19 |
| 20 IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid, | 20 IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid, |
| 21 int sdp_mline_index, | 21 int sdp_mline_index, |
| 22 const std::string& sdp, | 22 const std::string& sdp, |
| 23 SdpParseError* error) { | 23 SdpParseError* error) { |
| 24 JsepIceCandidate* jsep_ice = new JsepIceCandidate(sdp_mid, sdp_mline_index); | 24 JsepIceCandidate* jsep_ice = new JsepIceCandidate(sdp_mid, sdp_mline_index); |
| 25 if (!jsep_ice->Initialize(sdp, error)) { | 25 if (!jsep_ice->Initialize(sdp, error)) { |
| 26 delete jsep_ice; | 26 delete jsep_ice; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 }); | 86 }); |
| 87 if (iter != candidates_.end()) { | 87 if (iter != candidates_.end()) { |
| 88 delete *iter; | 88 delete *iter; |
| 89 candidates_.erase(iter); | 89 candidates_.erase(iter); |
| 90 return 1; | 90 return 1; |
| 91 } | 91 } |
| 92 return 0; | 92 return 0; |
| 93 } | 93 } |
| 94 | 94 |
| 95 } // namespace webrtc | 95 } // namespace webrtc |
| OLD | NEW |