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

Side by Side Diff: talk/app/webrtc/jsepicecandidate.cc

Issue 1237613003: Remove deprecated functions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Call new function from objc. Created 5 years, 5 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
« no previous file with comments | « talk/app/webrtc/jsep.h ('k') | talk/app/webrtc/jsepsessiondescription.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 18 matching lines...) Expand all
29 29
30 #include <vector> 30 #include <vector>
31 31
32 #include "talk/app/webrtc/webrtcsdp.h" 32 #include "talk/app/webrtc/webrtcsdp.h"
33 #include "webrtc/base/stringencode.h" 33 #include "webrtc/base/stringencode.h"
34 34
35 namespace webrtc { 35 namespace webrtc {
36 36
37 IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid, 37 IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid,
38 int sdp_mline_index, 38 int sdp_mline_index,
39 const std::string& sdp) {
40 return CreateIceCandidate(sdp_mid, sdp_mline_index, sdp, NULL);
41 }
42
43 IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid,
44 int sdp_mline_index,
45 const std::string& sdp, 39 const std::string& sdp,
46 SdpParseError* error) { 40 SdpParseError* error) {
47 JsepIceCandidate* jsep_ice = new JsepIceCandidate(sdp_mid, sdp_mline_index); 41 JsepIceCandidate* jsep_ice = new JsepIceCandidate(sdp_mid, sdp_mline_index);
48 if (!jsep_ice->Initialize(sdp, error)) { 42 if (!jsep_ice->Initialize(sdp, error)) {
49 delete jsep_ice; 43 delete jsep_ice;
50 return NULL; 44 return NULL;
51 } 45 }
52 return jsep_ice; 46 return jsep_ice;
53 } 47 }
54 48
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 (*it)->sdp_mline_index() == candidate->sdp_mline_index() && 90 (*it)->sdp_mline_index() == candidate->sdp_mline_index() &&
97 (*it)->candidate().IsEquivalent(candidate->candidate())) { 91 (*it)->candidate().IsEquivalent(candidate->candidate())) {
98 ret = true; 92 ret = true;
99 break; 93 break;
100 } 94 }
101 } 95 }
102 return ret; 96 return ret;
103 } 97 }
104 98
105 } // namespace webrtc 99 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/jsep.h ('k') | talk/app/webrtc/jsepsessiondescription.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698