mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
f05af9e0fc
This reverts commit 86e0ea5711.
Reason for revert: The reasons for removing bitratePriority are unclear. Aside from the fact that you can't yet use it for the relative bitrate of simulcast streams, only the relative bitrate of entire tracks, it's working as intended. It differs from the standard, but only in that it's more flexible; the web standard only allows values of 0.5, 1.0, 2.0, and 4.0 while for the native API we allow any ratio.
Original change's description:
> Remove bitratePriority from the Obj-C RTCRtpEncodingParameters wrapper.
>
> This was added in CL 135122, but the bitratePriority parameter is not
> standard and not implemented in a way users would expect. So it should
> actually not be exposed in the Obj-C SDK.
>
> Bug: webrtc:10438
> Change-Id: I801ce940a32701d2703e951ef2b601c606aa2111
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/135287
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Anders Carlsson <andersc@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27861}
TBR=andersc@webrtc.org,kthelgason@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:10438
Change-Id: Ibc16b6054a1583de43a868d98683ea114bd89435
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171140
Reviewed-by: Taylor <deadbeef@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30863}
124 lines
4.1 KiB
Text
124 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 "RTCRtpEncodingParameters+Private.h"
|
|
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@implementation 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;
|
|
|
|
- (instancetype)init {
|
|
return [super init];
|
|
}
|
|
|
|
- (instancetype)initWithNativeParameters:
|
|
(const webrtc::RtpEncodingParameters &)nativeParameters {
|
|
if (self = [self 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 =
|
|
[RTCRtpEncodingParameters priorityFromNativePriority:nativeParameters.network_priority];
|
|
}
|
|
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 =
|
|
[RTCRtpEncodingParameters nativePriorityFromPriority:_networkPriority];
|
|
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
|