Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Side by Side Diff: webrtc/api/jsepicecandidate.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * Copyright 2012 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #include "talk/app/webrtc/jsepicecandidate.h" 11 #include "webrtc/api/jsepicecandidate.h"
29 12
30 #include <vector> 13 #include <vector>
31 14
32 #include "talk/app/webrtc/webrtcsdp.h" 15 #include "webrtc/api/webrtcsdp.h"
33 #include "webrtc/base/stringencode.h" 16 #include "webrtc/base/stringencode.h"
34 17
35 namespace webrtc { 18 namespace webrtc {
36 19
37 IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid, 20 IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid,
38 int sdp_mline_index, 21 int sdp_mline_index,
39 const std::string& sdp, 22 const std::string& sdp,
40 SdpParseError* error) { 23 SdpParseError* error) {
41 JsepIceCandidate* jsep_ice = new JsepIceCandidate(sdp_mid, sdp_mline_index); 24 JsepIceCandidate* jsep_ice = new JsepIceCandidate(sdp_mid, sdp_mline_index);
42 if (!jsep_ice->Initialize(sdp, error)) { 25 if (!jsep_ice->Initialize(sdp, error)) {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 (*it)->sdp_mline_index() == candidate->sdp_mline_index() && 73 (*it)->sdp_mline_index() == candidate->sdp_mline_index() &&
91 (*it)->candidate().IsEquivalent(candidate->candidate())) { 74 (*it)->candidate().IsEquivalent(candidate->candidate())) {
92 ret = true; 75 ret = true;
93 break; 76 break;
94 } 77 }
95 } 78 }
96 return ret; 79 return ret;
97 } 80 }
98 81
99 } // namespace webrtc 82 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698