mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00

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}
190 lines
6.3 KiB
Text
190 lines
6.3 KiB
Text
/*
|
|
* Copyright 2018 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 "RTCRtpTransceiver+Private.h"
|
|
|
|
#import "RTCRtpEncodingParameters+Private.h"
|
|
#import "RTCRtpParameters+Private.h"
|
|
#import "RTCRtpReceiver+Private.h"
|
|
#import "RTCRtpSender+Private.h"
|
|
#import "base/RTCLogging.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
NSString *const kRTCRtpTransceiverErrorDomain = @"org.webrtc.RTCRtpTranceiver";
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCRtpTransceiverInit)
|
|
|
|
@synthesize direction = _direction;
|
|
@synthesize streamIds = _streamIds;
|
|
@synthesize sendEncodings = _sendEncodings;
|
|
|
|
- (instancetype)init {
|
|
if (self = [super init]) {
|
|
_direction = RTCRtpTransceiverDirectionSendRecv;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (webrtc::RtpTransceiverInit)nativeInit {
|
|
webrtc::RtpTransceiverInit init;
|
|
init.direction =
|
|
[RTC_OBJC_TYPE(RTCRtpTransceiver) nativeRtpTransceiverDirectionFromDirection:_direction];
|
|
for (NSString *streamId in _streamIds) {
|
|
init.stream_ids.push_back([streamId UTF8String]);
|
|
}
|
|
for (RTC_OBJC_TYPE(RTCRtpEncodingParameters) * sendEncoding in _sendEncodings) {
|
|
init.send_encodings.push_back(sendEncoding.nativeParameters);
|
|
}
|
|
return init;
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCRtpTransceiver) {
|
|
RTC_OBJC_TYPE(RTCPeerConnectionFactory) * _factory;
|
|
rtc::scoped_refptr<webrtc::RtpTransceiverInterface> _nativeRtpTransceiver;
|
|
}
|
|
|
|
- (RTCRtpMediaType)mediaType {
|
|
return [RTC_OBJC_TYPE(RTCRtpReceiver)
|
|
mediaTypeForNativeMediaType:_nativeRtpTransceiver->media_type()];
|
|
}
|
|
|
|
- (NSString *)mid {
|
|
if (_nativeRtpTransceiver->mid()) {
|
|
return [NSString stringForStdString:*_nativeRtpTransceiver->mid()];
|
|
} else {
|
|
return nil;
|
|
}
|
|
}
|
|
|
|
@synthesize sender = _sender;
|
|
@synthesize receiver = _receiver;
|
|
|
|
- (BOOL)isStopped {
|
|
return _nativeRtpTransceiver->stopped();
|
|
}
|
|
|
|
- (RTCRtpTransceiverDirection)direction {
|
|
return [RTC_OBJC_TYPE(RTCRtpTransceiver)
|
|
rtpTransceiverDirectionFromNativeDirection:_nativeRtpTransceiver->direction()];
|
|
}
|
|
|
|
- (void)setDirection:(RTCRtpTransceiverDirection)direction error:(NSError **)error {
|
|
webrtc::RTCError nativeError = _nativeRtpTransceiver->SetDirectionWithError(
|
|
[RTC_OBJC_TYPE(RTCRtpTransceiver) nativeRtpTransceiverDirectionFromDirection:direction]);
|
|
|
|
if (!nativeError.ok() && error) {
|
|
*error = [NSError errorWithDomain:kRTCRtpTransceiverErrorDomain
|
|
code:static_cast<int>(nativeError.type())
|
|
userInfo:@{
|
|
@"message" : [NSString stringWithCString:nativeError.message()
|
|
encoding:NSUTF8StringEncoding]
|
|
}];
|
|
}
|
|
}
|
|
|
|
- (BOOL)currentDirection:(RTCRtpTransceiverDirection *)currentDirectionOut {
|
|
if (_nativeRtpTransceiver->current_direction()) {
|
|
*currentDirectionOut = [RTC_OBJC_TYPE(RTCRtpTransceiver)
|
|
rtpTransceiverDirectionFromNativeDirection:*_nativeRtpTransceiver->current_direction()];
|
|
return YES;
|
|
} else {
|
|
return NO;
|
|
}
|
|
}
|
|
|
|
- (void)stopInternal {
|
|
_nativeRtpTransceiver->StopInternal();
|
|
}
|
|
|
|
- (NSString *)description {
|
|
return [NSString
|
|
stringWithFormat:@"RTC_OBJC_TYPE(RTCRtpTransceiver) {\n sender: %@\n receiver: %@\n}",
|
|
_sender,
|
|
_receiver];
|
|
}
|
|
|
|
- (BOOL)isEqual:(id)object {
|
|
if (self == object) {
|
|
return YES;
|
|
}
|
|
if (object == nil) {
|
|
return NO;
|
|
}
|
|
if (![object isMemberOfClass:[self class]]) {
|
|
return NO;
|
|
}
|
|
RTC_OBJC_TYPE(RTCRtpTransceiver) *transceiver = (RTC_OBJC_TYPE(RTCRtpTransceiver) *)object;
|
|
return _nativeRtpTransceiver == transceiver.nativeRtpTransceiver;
|
|
}
|
|
|
|
- (NSUInteger)hash {
|
|
return (NSUInteger)_nativeRtpTransceiver.get();
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (rtc::scoped_refptr<webrtc::RtpTransceiverInterface>)nativeRtpTransceiver {
|
|
return _nativeRtpTransceiver;
|
|
}
|
|
|
|
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
|
|
nativeRtpTransceiver:
|
|
(rtc::scoped_refptr<webrtc::RtpTransceiverInterface>)nativeRtpTransceiver {
|
|
NSParameterAssert(factory);
|
|
NSParameterAssert(nativeRtpTransceiver);
|
|
if (self = [super init]) {
|
|
_factory = factory;
|
|
_nativeRtpTransceiver = nativeRtpTransceiver;
|
|
_sender = [[RTC_OBJC_TYPE(RTCRtpSender) alloc] initWithFactory:_factory
|
|
nativeRtpSender:nativeRtpTransceiver->sender()];
|
|
_receiver =
|
|
[[RTC_OBJC_TYPE(RTCRtpReceiver) alloc] initWithFactory:_factory
|
|
nativeRtpReceiver:nativeRtpTransceiver->receiver()];
|
|
RTCLogInfo(
|
|
@"RTC_OBJC_TYPE(RTCRtpTransceiver)(%p): created transceiver: %@", self, self.description);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
+ (webrtc::RtpTransceiverDirection)nativeRtpTransceiverDirectionFromDirection:
|
|
(RTCRtpTransceiverDirection)direction {
|
|
switch (direction) {
|
|
case RTCRtpTransceiverDirectionSendRecv:
|
|
return webrtc::RtpTransceiverDirection::kSendRecv;
|
|
case RTCRtpTransceiverDirectionSendOnly:
|
|
return webrtc::RtpTransceiverDirection::kSendOnly;
|
|
case RTCRtpTransceiverDirectionRecvOnly:
|
|
return webrtc::RtpTransceiverDirection::kRecvOnly;
|
|
case RTCRtpTransceiverDirectionInactive:
|
|
return webrtc::RtpTransceiverDirection::kInactive;
|
|
case RTCRtpTransceiverDirectionStopped:
|
|
return webrtc::RtpTransceiverDirection::kStopped;
|
|
}
|
|
}
|
|
|
|
+ (RTCRtpTransceiverDirection)rtpTransceiverDirectionFromNativeDirection:
|
|
(webrtc::RtpTransceiverDirection)nativeDirection {
|
|
switch (nativeDirection) {
|
|
case webrtc::RtpTransceiverDirection::kSendRecv:
|
|
return RTCRtpTransceiverDirectionSendRecv;
|
|
case webrtc::RtpTransceiverDirection::kSendOnly:
|
|
return RTCRtpTransceiverDirectionSendOnly;
|
|
case webrtc::RtpTransceiverDirection::kRecvOnly:
|
|
return RTCRtpTransceiverDirectionRecvOnly;
|
|
case webrtc::RtpTransceiverDirection::kInactive:
|
|
return RTCRtpTransceiverDirectionInactive;
|
|
case webrtc::RtpTransceiverDirection::kStopped:
|
|
return RTCRtpTransceiverDirectionStopped;
|
|
}
|
|
}
|
|
|
|
@end
|