mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +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}
128 lines
4.4 KiB
Text
128 lines
4.4 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 "RTCRtpEncodingParameters+Private.h"
|
|
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCRtpEncodingParameters)
|
|
|
|
@synthesize rid = _rid;
|
|
@synthesize isActive = _isActive;
|
|
@synthesize maxBitrateBps = _maxBitrateBps;
|
|
@synthesize minBitrateBps = _minBitrateBps;
|
|
@synthesize maxFramerate = _maxFramerate;
|
|
@synthesize numTemporalLayers = _numTemporalLayers;
|
|
@synthesize scaleResolutionDownBy = _scaleResolutionDownBy;
|
|
@synthesize ssrc = _ssrc;
|
|
@synthesize bitratePriority = _bitratePriority;
|
|
@synthesize networkPriority = _networkPriority;
|
|
@synthesize adaptiveAudioPacketTime = _adaptiveAudioPacketTime;
|
|
|
|
- (instancetype)init {
|
|
webrtc::RtpEncodingParameters nativeParameters;
|
|
return [self initWithNativeParameters:nativeParameters];
|
|
}
|
|
|
|
- (instancetype)initWithNativeParameters:
|
|
(const webrtc::RtpEncodingParameters &)nativeParameters {
|
|
if (self = [super init]) {
|
|
if (!nativeParameters.rid.empty()) {
|
|
_rid = [NSString stringForStdString:nativeParameters.rid];
|
|
}
|
|
_isActive = nativeParameters.active;
|
|
if (nativeParameters.max_bitrate_bps) {
|
|
_maxBitrateBps =
|
|
[NSNumber numberWithInt:*nativeParameters.max_bitrate_bps];
|
|
}
|
|
if (nativeParameters.min_bitrate_bps) {
|
|
_minBitrateBps =
|
|
[NSNumber numberWithInt:*nativeParameters.min_bitrate_bps];
|
|
}
|
|
if (nativeParameters.max_framerate) {
|
|
_maxFramerate = [NSNumber numberWithInt:*nativeParameters.max_framerate];
|
|
}
|
|
if (nativeParameters.num_temporal_layers) {
|
|
_numTemporalLayers = [NSNumber numberWithInt:*nativeParameters.num_temporal_layers];
|
|
}
|
|
if (nativeParameters.scale_resolution_down_by) {
|
|
_scaleResolutionDownBy =
|
|
[NSNumber numberWithDouble:*nativeParameters.scale_resolution_down_by];
|
|
}
|
|
if (nativeParameters.ssrc) {
|
|
_ssrc = [NSNumber numberWithUnsignedLong:*nativeParameters.ssrc];
|
|
}
|
|
_bitratePriority = nativeParameters.bitrate_priority;
|
|
_networkPriority = [RTC_OBJC_TYPE(RTCRtpEncodingParameters)
|
|
priorityFromNativePriority:nativeParameters.network_priority];
|
|
_adaptiveAudioPacketTime = nativeParameters.adaptive_ptime;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (webrtc::RtpEncodingParameters)nativeParameters {
|
|
webrtc::RtpEncodingParameters parameters;
|
|
if (_rid != nil) {
|
|
parameters.rid = [NSString stdStringForString:_rid];
|
|
}
|
|
parameters.active = _isActive;
|
|
if (_maxBitrateBps != nil) {
|
|
parameters.max_bitrate_bps = absl::optional<int>(_maxBitrateBps.intValue);
|
|
}
|
|
if (_minBitrateBps != nil) {
|
|
parameters.min_bitrate_bps = absl::optional<int>(_minBitrateBps.intValue);
|
|
}
|
|
if (_maxFramerate != nil) {
|
|
parameters.max_framerate = absl::optional<int>(_maxFramerate.intValue);
|
|
}
|
|
if (_numTemporalLayers != nil) {
|
|
parameters.num_temporal_layers = absl::optional<int>(_numTemporalLayers.intValue);
|
|
}
|
|
if (_scaleResolutionDownBy != nil) {
|
|
parameters.scale_resolution_down_by =
|
|
absl::optional<double>(_scaleResolutionDownBy.doubleValue);
|
|
}
|
|
if (_ssrc != nil) {
|
|
parameters.ssrc = absl::optional<uint32_t>(_ssrc.unsignedLongValue);
|
|
}
|
|
parameters.bitrate_priority = _bitratePriority;
|
|
parameters.network_priority =
|
|
[RTC_OBJC_TYPE(RTCRtpEncodingParameters) nativePriorityFromPriority:_networkPriority];
|
|
parameters.adaptive_ptime = _adaptiveAudioPacketTime;
|
|
return parameters;
|
|
}
|
|
|
|
+ (webrtc::Priority)nativePriorityFromPriority:(RTCPriority)networkPriority {
|
|
switch (networkPriority) {
|
|
case RTCPriorityVeryLow:
|
|
return webrtc::Priority::kVeryLow;
|
|
case RTCPriorityLow:
|
|
return webrtc::Priority::kLow;
|
|
case RTCPriorityMedium:
|
|
return webrtc::Priority::kMedium;
|
|
case RTCPriorityHigh:
|
|
return webrtc::Priority::kHigh;
|
|
}
|
|
}
|
|
|
|
+ (RTCPriority)priorityFromNativePriority:(webrtc::Priority)nativePriority {
|
|
switch (nativePriority) {
|
|
case webrtc::Priority::kVeryLow:
|
|
return RTCPriorityVeryLow;
|
|
case webrtc::Priority::kLow:
|
|
return RTCPriorityLow;
|
|
case webrtc::Priority::kMedium:
|
|
return RTCPriorityMedium;
|
|
case webrtc::Priority::kHigh:
|
|
return RTCPriorityHigh;
|
|
}
|
|
}
|
|
|
|
@end
|