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}
161 lines
5.4 KiB
Text
161 lines
5.4 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 "RTCAudioTrack+Private.h"
|
|
#import "RTCMediaStreamTrack+Private.h"
|
|
#import "RTCVideoTrack+Private.h"
|
|
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
NSString * const kRTCMediaStreamTrackKindAudio =
|
|
@(webrtc::MediaStreamTrackInterface::kAudioKind);
|
|
NSString * const kRTCMediaStreamTrackKindVideo =
|
|
@(webrtc::MediaStreamTrackInterface::kVideoKind);
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCMediaStreamTrack) {
|
|
RTC_OBJC_TYPE(RTCPeerConnectionFactory) * _factory;
|
|
rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> _nativeTrack;
|
|
RTCMediaStreamTrackType _type;
|
|
}
|
|
|
|
- (NSString *)kind {
|
|
return [NSString stringForStdString:_nativeTrack->kind()];
|
|
}
|
|
|
|
- (NSString *)trackId {
|
|
return [NSString stringForStdString:_nativeTrack->id()];
|
|
}
|
|
|
|
- (BOOL)isEnabled {
|
|
return _nativeTrack->enabled();
|
|
}
|
|
|
|
- (void)setIsEnabled:(BOOL)isEnabled {
|
|
_nativeTrack->set_enabled(isEnabled);
|
|
}
|
|
|
|
- (RTCMediaStreamTrackState)readyState {
|
|
return [[self class] trackStateForNativeState:_nativeTrack->state()];
|
|
}
|
|
|
|
- (NSString *)description {
|
|
NSString *readyState = [[self class] stringForState:self.readyState];
|
|
return [NSString stringWithFormat:@"RTC_OBJC_TYPE(RTCMediaStreamTrack):\n%@\n%@\n%@\n%@",
|
|
self.kind,
|
|
self.trackId,
|
|
self.isEnabled ? @"enabled" : @"disabled",
|
|
readyState];
|
|
}
|
|
|
|
- (BOOL)isEqual:(id)object {
|
|
if (self == object) {
|
|
return YES;
|
|
}
|
|
if (![object isMemberOfClass:[self class]]) {
|
|
return NO;
|
|
}
|
|
return [self isEqualToTrack:(RTC_OBJC_TYPE(RTCMediaStreamTrack) *)object];
|
|
}
|
|
|
|
- (NSUInteger)hash {
|
|
return (NSUInteger)_nativeTrack.get();
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeTrack {
|
|
return _nativeTrack;
|
|
}
|
|
|
|
@synthesize factory = _factory;
|
|
|
|
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
|
|
nativeTrack:(rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeTrack
|
|
type:(RTCMediaStreamTrackType)type {
|
|
NSParameterAssert(nativeTrack);
|
|
NSParameterAssert(factory);
|
|
if (self = [super init]) {
|
|
_factory = factory;
|
|
_nativeTrack = nativeTrack;
|
|
_type = type;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
|
|
nativeTrack:(rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeTrack {
|
|
NSParameterAssert(nativeTrack);
|
|
if (nativeTrack->kind() ==
|
|
std::string(webrtc::MediaStreamTrackInterface::kAudioKind)) {
|
|
return [self initWithFactory:factory nativeTrack:nativeTrack type:RTCMediaStreamTrackTypeAudio];
|
|
}
|
|
if (nativeTrack->kind() ==
|
|
std::string(webrtc::MediaStreamTrackInterface::kVideoKind)) {
|
|
return [self initWithFactory:factory nativeTrack:nativeTrack type:RTCMediaStreamTrackTypeVideo];
|
|
}
|
|
return nil;
|
|
}
|
|
|
|
- (BOOL)isEqualToTrack:(RTC_OBJC_TYPE(RTCMediaStreamTrack) *)track {
|
|
if (!track) {
|
|
return NO;
|
|
}
|
|
return _nativeTrack == track.nativeTrack;
|
|
}
|
|
|
|
+ (webrtc::MediaStreamTrackInterface::TrackState)nativeTrackStateForState:
|
|
(RTCMediaStreamTrackState)state {
|
|
switch (state) {
|
|
case RTCMediaStreamTrackStateLive:
|
|
return webrtc::MediaStreamTrackInterface::kLive;
|
|
case RTCMediaStreamTrackStateEnded:
|
|
return webrtc::MediaStreamTrackInterface::kEnded;
|
|
}
|
|
}
|
|
|
|
+ (RTCMediaStreamTrackState)trackStateForNativeState:
|
|
(webrtc::MediaStreamTrackInterface::TrackState)nativeState {
|
|
switch (nativeState) {
|
|
case webrtc::MediaStreamTrackInterface::kLive:
|
|
return RTCMediaStreamTrackStateLive;
|
|
case webrtc::MediaStreamTrackInterface::kEnded:
|
|
return RTCMediaStreamTrackStateEnded;
|
|
}
|
|
}
|
|
|
|
+ (NSString *)stringForState:(RTCMediaStreamTrackState)state {
|
|
switch (state) {
|
|
case RTCMediaStreamTrackStateLive:
|
|
return @"Live";
|
|
case RTCMediaStreamTrackStateEnded:
|
|
return @"Ended";
|
|
}
|
|
}
|
|
|
|
+ (RTC_OBJC_TYPE(RTCMediaStreamTrack) *)
|
|
mediaTrackForNativeTrack:(rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeTrack
|
|
factory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory {
|
|
NSParameterAssert(nativeTrack);
|
|
NSParameterAssert(factory);
|
|
if (nativeTrack->kind() == webrtc::MediaStreamTrackInterface::kAudioKind) {
|
|
return [[RTC_OBJC_TYPE(RTCAudioTrack) alloc] initWithFactory:factory
|
|
nativeTrack:nativeTrack
|
|
type:RTCMediaStreamTrackTypeAudio];
|
|
} else if (nativeTrack->kind() == webrtc::MediaStreamTrackInterface::kVideoKind) {
|
|
return [[RTC_OBJC_TYPE(RTCVideoTrack) alloc] initWithFactory:factory
|
|
nativeTrack:nativeTrack
|
|
type:RTCMediaStreamTrackTypeVideo];
|
|
} else {
|
|
return [[RTC_OBJC_TYPE(RTCMediaStreamTrack) alloc] initWithFactory:factory
|
|
nativeTrack:nativeTrack];
|
|
}
|
|
}
|
|
|
|
@end
|