mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +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}
132 lines
4.1 KiB
Text
132 lines
4.1 KiB
Text
/*
|
|
* Copyright 2016 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 "RTCRtpSender+Private.h"
|
|
|
|
#import "RTCDtmfSender+Private.h"
|
|
#import "RTCMediaStreamTrack+Private.h"
|
|
#import "RTCRtpParameters+Private.h"
|
|
#import "RTCRtpSender+Native.h"
|
|
#import "base/RTCLogging.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
#include "api/media_stream_interface.h"
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCRtpSender) {
|
|
RTC_OBJC_TYPE(RTCPeerConnectionFactory) * _factory;
|
|
rtc::scoped_refptr<webrtc::RtpSenderInterface> _nativeRtpSender;
|
|
}
|
|
|
|
@synthesize dtmfSender = _dtmfSender;
|
|
|
|
- (NSString *)senderId {
|
|
return [NSString stringForStdString:_nativeRtpSender->id()];
|
|
}
|
|
|
|
- (RTC_OBJC_TYPE(RTCRtpParameters) *)parameters {
|
|
return [[RTC_OBJC_TYPE(RTCRtpParameters) alloc]
|
|
initWithNativeParameters:_nativeRtpSender->GetParameters()];
|
|
}
|
|
|
|
- (void)setParameters:(RTC_OBJC_TYPE(RTCRtpParameters) *)parameters {
|
|
if (!_nativeRtpSender->SetParameters(parameters.nativeParameters).ok()) {
|
|
RTCLogError(@"RTC_OBJC_TYPE(RTCRtpSender)(%p): Failed to set parameters: %@", self, parameters);
|
|
}
|
|
}
|
|
|
|
- (RTC_OBJC_TYPE(RTCMediaStreamTrack) *)track {
|
|
rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> nativeTrack(
|
|
_nativeRtpSender->track());
|
|
if (nativeTrack) {
|
|
return [RTC_OBJC_TYPE(RTCMediaStreamTrack) mediaTrackForNativeTrack:nativeTrack
|
|
factory:_factory];
|
|
}
|
|
return nil;
|
|
}
|
|
|
|
- (void)setTrack:(RTC_OBJC_TYPE(RTCMediaStreamTrack) *)track {
|
|
if (!_nativeRtpSender->SetTrack(track.nativeTrack.get())) {
|
|
RTCLogError(@"RTC_OBJC_TYPE(RTCRtpSender)(%p): Failed to set track %@", self, track);
|
|
}
|
|
}
|
|
|
|
- (NSArray<NSString *> *)streamIds {
|
|
std::vector<std::string> nativeStreamIds = _nativeRtpSender->stream_ids();
|
|
NSMutableArray *streamIds = [NSMutableArray arrayWithCapacity:nativeStreamIds.size()];
|
|
for (const auto &s : nativeStreamIds) {
|
|
[streamIds addObject:[NSString stringForStdString:s]];
|
|
}
|
|
return streamIds;
|
|
}
|
|
|
|
- (void)setStreamIds:(NSArray<NSString *> *)streamIds {
|
|
std::vector<std::string> nativeStreamIds;
|
|
for (NSString *streamId in streamIds) {
|
|
nativeStreamIds.push_back([streamId UTF8String]);
|
|
}
|
|
_nativeRtpSender->SetStreams(nativeStreamIds);
|
|
}
|
|
|
|
- (NSString *)description {
|
|
return [NSString
|
|
stringWithFormat:@"RTC_OBJC_TYPE(RTCRtpSender) {\n senderId: %@\n}", self.senderId];
|
|
}
|
|
|
|
- (BOOL)isEqual:(id)object {
|
|
if (self == object) {
|
|
return YES;
|
|
}
|
|
if (object == nil) {
|
|
return NO;
|
|
}
|
|
if (![object isMemberOfClass:[self class]]) {
|
|
return NO;
|
|
}
|
|
RTC_OBJC_TYPE(RTCRtpSender) *sender = (RTC_OBJC_TYPE(RTCRtpSender) *)object;
|
|
return _nativeRtpSender == sender.nativeRtpSender;
|
|
}
|
|
|
|
- (NSUInteger)hash {
|
|
return (NSUInteger)_nativeRtpSender.get();
|
|
}
|
|
|
|
#pragma mark - Native
|
|
|
|
- (void)setFrameEncryptor:(rtc::scoped_refptr<webrtc::FrameEncryptorInterface>)frameEncryptor {
|
|
_nativeRtpSender->SetFrameEncryptor(frameEncryptor);
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (rtc::scoped_refptr<webrtc::RtpSenderInterface>)nativeRtpSender {
|
|
return _nativeRtpSender;
|
|
}
|
|
|
|
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
|
|
nativeRtpSender:(rtc::scoped_refptr<webrtc::RtpSenderInterface>)nativeRtpSender {
|
|
NSParameterAssert(factory);
|
|
NSParameterAssert(nativeRtpSender);
|
|
if (self = [super init]) {
|
|
_factory = factory;
|
|
_nativeRtpSender = nativeRtpSender;
|
|
if (_nativeRtpSender->media_type() == cricket::MEDIA_TYPE_AUDIO) {
|
|
rtc::scoped_refptr<webrtc::DtmfSenderInterface> nativeDtmfSender(
|
|
_nativeRtpSender->GetDtmfSender());
|
|
if (nativeDtmfSender) {
|
|
_dtmfSender =
|
|
[[RTC_OBJC_TYPE(RTCDtmfSender) alloc] initWithNativeDtmfSender:nativeDtmfSender];
|
|
}
|
|
}
|
|
RTCLogInfo(@"RTC_OBJC_TYPE(RTCRtpSender)(%p): created sender: %@", self, self.description);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
@end
|