mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
63ee39d0be
This reverts commit 181ea6e414.
Reason for revert: Breaks downstream project. Kári will help to land it next week.
Original change's description:
> Add a prefix for objc category.
>
> According to the Google Objective-C style [1], category names should
> start with an appropriate prefix. WebRTC has some category definitions
> for system interfaces, but it doesn't use prefixes.
>
> $ otool -ov WebRTC.framework/WebRTC | grep -E "^[0-9a-z]{16} 0x[0-9a-z]+ __OBJC_._CATEGORY" | grep -v "_RTC"
> 0000000002160840 0x217c3c0 __OBJC_$_CATEGORY_UIDevice_$_H264Profile
> 0000000002160850 0x21808b8 __OBJC_$_CATEGORY_AVCaptureSession_$_DevicePosition
> 0000000002160858 0x2180968 __OBJC_$_CATEGORY_NSString_$_StdString
> 0000000002160860 0x21809c8 __OBJC_$_CATEGORY_NSString_$_AbslStringView
>
> To avoid conflicts, prefix the names and methods of those categories.
> Also remove sdk/objc/Framework/Classes/Common/NSString+StdString.h as
> it is not used by any other files.
>
> [1] https://google.github.io/styleguide/objcguide.html#category-naming
>
> Bug: webrtc:13884
> Change-Id: I2cf2742af198ab4e0bfb15c0476d72971e50ceee
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262341
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36880}
Bug: webrtc:13884
Change-Id: I85257088e4a3a62e01ff925ab5e77af83b078ef3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262420
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36885}
76 lines
2.3 KiB
Text
76 lines
2.3 KiB
Text
/*
|
|
* 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 "base/RTCLogging.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@implementation RTC_OBJC_TYPE (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:@"RTC_OBJC_TYPE(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);
|
|
|
|
RTC_OBJC_TYPE(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
|