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}
121 lines
4.7 KiB
Text
121 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 "RTCRtpParameters+Private.h"
|
|
|
|
#import "RTCRtcpParameters+Private.h"
|
|
#import "RTCRtpCodecParameters+Private.h"
|
|
#import "RTCRtpEncodingParameters+Private.h"
|
|
#import "RTCRtpHeaderExtension+Private.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCRtpParameters)
|
|
|
|
@synthesize transactionId = _transactionId;
|
|
@synthesize rtcp = _rtcp;
|
|
@synthesize headerExtensions = _headerExtensions;
|
|
@synthesize encodings = _encodings;
|
|
@synthesize codecs = _codecs;
|
|
@synthesize degradationPreference = _degradationPreference;
|
|
|
|
- (instancetype)init {
|
|
webrtc::RtpParameters nativeParameters;
|
|
return [self initWithNativeParameters:nativeParameters];
|
|
}
|
|
|
|
- (instancetype)initWithNativeParameters:
|
|
(const webrtc::RtpParameters &)nativeParameters {
|
|
if (self = [super init]) {
|
|
_transactionId = [NSString stringForStdString:nativeParameters.transaction_id];
|
|
_rtcp =
|
|
[[RTC_OBJC_TYPE(RTCRtcpParameters) alloc] initWithNativeParameters:nativeParameters.rtcp];
|
|
|
|
NSMutableArray *headerExtensions = [[NSMutableArray alloc] init];
|
|
for (const auto &headerExtension : nativeParameters.header_extensions) {
|
|
[headerExtensions addObject:[[RTC_OBJC_TYPE(RTCRtpHeaderExtension) alloc]
|
|
initWithNativeParameters:headerExtension]];
|
|
}
|
|
_headerExtensions = headerExtensions;
|
|
|
|
NSMutableArray *encodings = [[NSMutableArray alloc] init];
|
|
for (const auto &encoding : nativeParameters.encodings) {
|
|
[encodings addObject:[[RTC_OBJC_TYPE(RTCRtpEncodingParameters) alloc]
|
|
initWithNativeParameters:encoding]];
|
|
}
|
|
_encodings = encodings;
|
|
|
|
NSMutableArray *codecs = [[NSMutableArray alloc] init];
|
|
for (const auto &codec : nativeParameters.codecs) {
|
|
[codecs
|
|
addObject:[[RTC_OBJC_TYPE(RTCRtpCodecParameters) alloc] initWithNativeParameters:codec]];
|
|
}
|
|
_codecs = codecs;
|
|
|
|
_degradationPreference = [RTC_OBJC_TYPE(RTCRtpParameters)
|
|
degradationPreferenceFromNativeDegradationPreference:nativeParameters
|
|
.degradation_preference];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (webrtc::RtpParameters)nativeParameters {
|
|
webrtc::RtpParameters parameters;
|
|
parameters.transaction_id = [NSString stdStringForString:_transactionId];
|
|
parameters.rtcp = [_rtcp nativeParameters];
|
|
for (RTC_OBJC_TYPE(RTCRtpHeaderExtension) * headerExtension in _headerExtensions) {
|
|
parameters.header_extensions.push_back(headerExtension.nativeParameters);
|
|
}
|
|
for (RTC_OBJC_TYPE(RTCRtpEncodingParameters) * encoding in _encodings) {
|
|
parameters.encodings.push_back(encoding.nativeParameters);
|
|
}
|
|
for (RTC_OBJC_TYPE(RTCRtpCodecParameters) * codec in _codecs) {
|
|
parameters.codecs.push_back(codec.nativeParameters);
|
|
}
|
|
if (_degradationPreference) {
|
|
parameters.degradation_preference = [RTC_OBJC_TYPE(RTCRtpParameters)
|
|
nativeDegradationPreferenceFromDegradationPreference:(RTCDegradationPreference)
|
|
_degradationPreference.intValue];
|
|
}
|
|
return parameters;
|
|
}
|
|
|
|
+ (webrtc::DegradationPreference)nativeDegradationPreferenceFromDegradationPreference:
|
|
(RTCDegradationPreference)degradationPreference {
|
|
switch (degradationPreference) {
|
|
case RTCDegradationPreferenceDisabled:
|
|
return webrtc::DegradationPreference::DISABLED;
|
|
case RTCDegradationPreferenceMaintainFramerate:
|
|
return webrtc::DegradationPreference::MAINTAIN_FRAMERATE;
|
|
case RTCDegradationPreferenceMaintainResolution:
|
|
return webrtc::DegradationPreference::MAINTAIN_RESOLUTION;
|
|
case RTCDegradationPreferenceBalanced:
|
|
return webrtc::DegradationPreference::BALANCED;
|
|
}
|
|
}
|
|
|
|
+ (NSNumber *)degradationPreferenceFromNativeDegradationPreference:
|
|
(absl::optional<webrtc::DegradationPreference>)nativeDegradationPreference {
|
|
if (!nativeDegradationPreference.has_value()) {
|
|
return nil;
|
|
}
|
|
|
|
switch (*nativeDegradationPreference) {
|
|
case webrtc::DegradationPreference::DISABLED:
|
|
return @(RTCDegradationPreferenceDisabled);
|
|
case webrtc::DegradationPreference::MAINTAIN_FRAMERATE:
|
|
return @(RTCDegradationPreferenceMaintainFramerate);
|
|
case webrtc::DegradationPreference::MAINTAIN_RESOLUTION:
|
|
return @(RTCDegradationPreferenceMaintainResolution);
|
|
case webrtc::DegradationPreference::BALANCED:
|
|
return @(RTCDegradationPreferenceBalanced);
|
|
}
|
|
}
|
|
|
|
@end
|