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}
159 lines
4.7 KiB
Text
159 lines
4.7 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 "RTCRtpReceiver+Private.h"
|
|
|
|
#import "RTCMediaStreamTrack+Private.h"
|
|
#import "RTCRtpParameters+Private.h"
|
|
#import "RTCRtpReceiver+Native.h"
|
|
#import "base/RTCLogging.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
#include "api/media_stream_interface.h"
|
|
|
|
namespace webrtc {
|
|
|
|
RtpReceiverDelegateAdapter::RtpReceiverDelegateAdapter(RTC_OBJC_TYPE(RTCRtpReceiver) * receiver) {
|
|
RTC_CHECK(receiver);
|
|
receiver_ = receiver;
|
|
}
|
|
|
|
void RtpReceiverDelegateAdapter::OnFirstPacketReceived(
|
|
cricket::MediaType media_type) {
|
|
RTCRtpMediaType packet_media_type =
|
|
[RTC_OBJC_TYPE(RTCRtpReceiver) mediaTypeForNativeMediaType:media_type];
|
|
RTC_OBJC_TYPE(RTCRtpReceiver) *receiver = receiver_;
|
|
[receiver.delegate rtpReceiver:receiver didReceiveFirstPacketForMediaType:packet_media_type];
|
|
}
|
|
|
|
} // namespace webrtc
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCRtpReceiver) {
|
|
RTC_OBJC_TYPE(RTCPeerConnectionFactory) * _factory;
|
|
rtc::scoped_refptr<webrtc::RtpReceiverInterface> _nativeRtpReceiver;
|
|
std::unique_ptr<webrtc::RtpReceiverDelegateAdapter> _observer;
|
|
}
|
|
|
|
@synthesize delegate = _delegate;
|
|
|
|
- (NSString *)receiverId {
|
|
return [NSString stringForStdString:_nativeRtpReceiver->id()];
|
|
}
|
|
|
|
- (RTC_OBJC_TYPE(RTCRtpParameters) *)parameters {
|
|
return [[RTC_OBJC_TYPE(RTCRtpParameters) alloc]
|
|
initWithNativeParameters:_nativeRtpReceiver->GetParameters()];
|
|
}
|
|
|
|
- (nullable RTC_OBJC_TYPE(RTCMediaStreamTrack) *)track {
|
|
rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> nativeTrack(
|
|
_nativeRtpReceiver->track());
|
|
if (nativeTrack) {
|
|
return [RTC_OBJC_TYPE(RTCMediaStreamTrack) mediaTrackForNativeTrack:nativeTrack
|
|
factory:_factory];
|
|
}
|
|
return nil;
|
|
}
|
|
|
|
- (NSString *)description {
|
|
return [NSString
|
|
stringWithFormat:@"RTC_OBJC_TYPE(RTCRtpReceiver) {\n receiverId: %@\n}", self.receiverId];
|
|
}
|
|
|
|
- (void)dealloc {
|
|
if (_nativeRtpReceiver) {
|
|
_nativeRtpReceiver->SetObserver(nullptr);
|
|
}
|
|
}
|
|
|
|
- (BOOL)isEqual:(id)object {
|
|
if (self == object) {
|
|
return YES;
|
|
}
|
|
if (object == nil) {
|
|
return NO;
|
|
}
|
|
if (![object isMemberOfClass:[self class]]) {
|
|
return NO;
|
|
}
|
|
RTC_OBJC_TYPE(RTCRtpReceiver) *receiver = (RTC_OBJC_TYPE(RTCRtpReceiver) *)object;
|
|
return _nativeRtpReceiver == receiver.nativeRtpReceiver;
|
|
}
|
|
|
|
- (NSUInteger)hash {
|
|
return (NSUInteger)_nativeRtpReceiver.get();
|
|
}
|
|
|
|
#pragma mark - Native
|
|
|
|
- (void)setFrameDecryptor:(rtc::scoped_refptr<webrtc::FrameDecryptorInterface>)frameDecryptor {
|
|
_nativeRtpReceiver->SetFrameDecryptor(frameDecryptor);
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (rtc::scoped_refptr<webrtc::RtpReceiverInterface>)nativeRtpReceiver {
|
|
return _nativeRtpReceiver;
|
|
}
|
|
|
|
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
|
|
nativeRtpReceiver:
|
|
(rtc::scoped_refptr<webrtc::RtpReceiverInterface>)nativeRtpReceiver {
|
|
if (self = [super init]) {
|
|
_factory = factory;
|
|
_nativeRtpReceiver = nativeRtpReceiver;
|
|
RTCLogInfo(@"RTC_OBJC_TYPE(RTCRtpReceiver)(%p): created receiver: %@", self, self.description);
|
|
_observer.reset(new webrtc::RtpReceiverDelegateAdapter(self));
|
|
_nativeRtpReceiver->SetObserver(_observer.get());
|
|
}
|
|
return self;
|
|
}
|
|
|
|
+ (RTCRtpMediaType)mediaTypeForNativeMediaType:
|
|
(cricket::MediaType)nativeMediaType {
|
|
switch (nativeMediaType) {
|
|
case cricket::MEDIA_TYPE_AUDIO:
|
|
return RTCRtpMediaTypeAudio;
|
|
case cricket::MEDIA_TYPE_VIDEO:
|
|
return RTCRtpMediaTypeVideo;
|
|
case cricket::MEDIA_TYPE_DATA:
|
|
return RTCRtpMediaTypeData;
|
|
case cricket::MEDIA_TYPE_UNSUPPORTED:
|
|
return RTCRtpMediaTypeUnsupported;
|
|
}
|
|
}
|
|
|
|
+ (cricket::MediaType)nativeMediaTypeForMediaType:(RTCRtpMediaType)mediaType {
|
|
switch (mediaType) {
|
|
case RTCRtpMediaTypeAudio:
|
|
return cricket::MEDIA_TYPE_AUDIO;
|
|
case RTCRtpMediaTypeVideo:
|
|
return cricket::MEDIA_TYPE_VIDEO;
|
|
case RTCRtpMediaTypeData:
|
|
return cricket::MEDIA_TYPE_DATA;
|
|
case RTCRtpMediaTypeUnsupported:
|
|
return cricket::MEDIA_TYPE_UNSUPPORTED;
|
|
}
|
|
}
|
|
|
|
+ (NSString *)stringForMediaType:(RTCRtpMediaType)mediaType {
|
|
switch (mediaType) {
|
|
case RTCRtpMediaTypeAudio:
|
|
return @"AUDIO";
|
|
case RTCRtpMediaTypeVideo:
|
|
return @"VIDEO";
|
|
case RTCRtpMediaTypeData:
|
|
return @"DATA";
|
|
case RTCRtpMediaTypeUnsupported:
|
|
return @"UNSUPPORTED";
|
|
}
|
|
}
|
|
|
|
@end
|