37144b214e
Reason for revert: Still problems with downstream projects Original issue's description: > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ ) > > Reason for revert: > Fixing downstream breakages > > Original issue's description: > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ ) > > > > Reason for revert: > > Breaking downstream projects. > > > > Original issue's description: > > > Split iOS sdk in to separate targets > > > > > > This CL splits the iOS sdk into separate static libraries for video, > > > audio, ui, common, and peerconnection-related code. This will in the > > > future make it easier to compile WebRTC without unneeded components. > > > > > > BUG=webrtc:4867 > > > > > > Review-Url: https://codereview.webrtc.org/2862543002 > > > Cr-Commit-Position: refs/heads/master@{#18166} > > > Committed:52c83fe710> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:4867 > > > > Review-Url: https://codereview.webrtc.org/2890513002 > > Cr-Commit-Position: refs/heads/master@{#18170} > > Committed:9756238084> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:4867 > > Review-Url: https://codereview.webrtc.org/2890733003 > Cr-Commit-Position: refs/heads/master@{#18174} > Committed:d51e042492TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4867 Review-Url: https://codereview.webrtc.org/2893593002 Cr-Commit-Position: refs/heads/master@{#18182}
77 lines
2.3 KiB
Plaintext
77 lines
2.3 KiB
Plaintext
/*
|
|
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import "RTCIceCandidate+Private.h"
|
|
|
|
#include <memory>
|
|
|
|
#import "NSString+StdString.h"
|
|
#import "WebRTC/RTCLogging.h"
|
|
|
|
@implementation RTCIceCandidate
|
|
|
|
@synthesize sdpMid = _sdpMid;
|
|
@synthesize sdpMLineIndex = _sdpMLineIndex;
|
|
@synthesize sdp = _sdp;
|
|
@synthesize serverUrl = _serverUrl;
|
|
|
|
- (instancetype)initWithSdp:(NSString *)sdp
|
|
sdpMLineIndex:(int)sdpMLineIndex
|
|
sdpMid:(NSString *)sdpMid {
|
|
NSParameterAssert(sdp.length);
|
|
if (self = [super init]) {
|
|
_sdpMid = [sdpMid copy];
|
|
_sdpMLineIndex = sdpMLineIndex;
|
|
_sdp = [sdp copy];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (NSString *)description {
|
|
return [NSString stringWithFormat:@"RTCIceCandidate:\n%@\n%d\n%@\n%@",
|
|
_sdpMid,
|
|
_sdpMLineIndex,
|
|
_sdp,
|
|
_serverUrl];
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (instancetype)initWithNativeCandidate:
|
|
(const webrtc::IceCandidateInterface *)candidate {
|
|
NSParameterAssert(candidate);
|
|
std::string sdp;
|
|
candidate->ToString(&sdp);
|
|
|
|
RTCIceCandidate *rtcCandidate =
|
|
[self initWithSdp:[NSString stringForStdString:sdp]
|
|
sdpMLineIndex:candidate->sdp_mline_index()
|
|
sdpMid:[NSString stringForStdString:candidate->sdp_mid()]];
|
|
rtcCandidate->_serverUrl = [NSString stringForStdString:candidate->server_url()];
|
|
return rtcCandidate;
|
|
}
|
|
|
|
- (std::unique_ptr<webrtc::IceCandidateInterface>)nativeCandidate {
|
|
webrtc::SdpParseError error;
|
|
|
|
webrtc::IceCandidateInterface *candidate = webrtc::CreateIceCandidate(
|
|
_sdpMid.stdString, _sdpMLineIndex, _sdp.stdString, &error);
|
|
|
|
if (!candidate) {
|
|
RTCLog(@"Failed to create ICE candidate: %s\nline: %s",
|
|
error.description.c_str(),
|
|
error.line.c_str());
|
|
}
|
|
|
|
return std::unique_ptr<webrtc::IceCandidateInterface>(candidate);
|
|
}
|
|
|
|
@end
|