mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 22:30:40 +01:00
9aec8c239f
Before these changes default initialized iOS wrappers around various RTP*Parameters types had their own default values of nonnull values, which did not always matched default values from native code, which then causes override of default native values, if library user didn't specified it's own initialization. After these changes default initialization of iOS wrappers uses default property values from default initialized native types. Bug: None Change-Id: Ie21a7dc38ddc3862aca8ec424859c776c67b1388 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215220 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33731}
113 lines
4.3 KiB
Text
113 lines
4.3 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 "RTCRtpCodecParameters+Private.h"
|
|
|
|
#import "RTCMediaStreamTrack.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
#include "media/base/media_constants.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
const NSString * const kRTCRtxCodecName = @(cricket::kRtxCodecName);
|
|
const NSString * const kRTCRedCodecName = @(cricket::kRedCodecName);
|
|
const NSString * const kRTCUlpfecCodecName = @(cricket::kUlpfecCodecName);
|
|
const NSString * const kRTCFlexfecCodecName = @(cricket::kFlexfecCodecName);
|
|
const NSString * const kRTCOpusCodecName = @(cricket::kOpusCodecName);
|
|
const NSString * const kRTCIsacCodecName = @(cricket::kIsacCodecName);
|
|
const NSString * const kRTCL16CodecName = @(cricket::kL16CodecName);
|
|
const NSString * const kRTCG722CodecName = @(cricket::kG722CodecName);
|
|
const NSString * const kRTCIlbcCodecName = @(cricket::kIlbcCodecName);
|
|
const NSString * const kRTCPcmuCodecName = @(cricket::kPcmuCodecName);
|
|
const NSString * const kRTCPcmaCodecName = @(cricket::kPcmaCodecName);
|
|
const NSString * const kRTCDtmfCodecName = @(cricket::kDtmfCodecName);
|
|
const NSString * const kRTCComfortNoiseCodecName =
|
|
@(cricket::kComfortNoiseCodecName);
|
|
const NSString * const kRTCVp8CodecName = @(cricket::kVp8CodecName);
|
|
const NSString * const kRTCVp9CodecName = @(cricket::kVp9CodecName);
|
|
const NSString * const kRTCH264CodecName = @(cricket::kH264CodecName);
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCRtpCodecParameters)
|
|
|
|
@synthesize payloadType = _payloadType;
|
|
@synthesize name = _name;
|
|
@synthesize kind = _kind;
|
|
@synthesize clockRate = _clockRate;
|
|
@synthesize numChannels = _numChannels;
|
|
@synthesize parameters = _parameters;
|
|
|
|
- (instancetype)init {
|
|
webrtc::RtpCodecParameters nativeParameters;
|
|
return [self initWithNativeParameters:nativeParameters];
|
|
}
|
|
|
|
- (instancetype)initWithNativeParameters:
|
|
(const webrtc::RtpCodecParameters &)nativeParameters {
|
|
if (self = [super init]) {
|
|
_payloadType = nativeParameters.payload_type;
|
|
_name = [NSString stringForStdString:nativeParameters.name];
|
|
switch (nativeParameters.kind) {
|
|
case cricket::MEDIA_TYPE_AUDIO:
|
|
_kind = kRTCMediaStreamTrackKindAudio;
|
|
break;
|
|
case cricket::MEDIA_TYPE_VIDEO:
|
|
_kind = kRTCMediaStreamTrackKindVideo;
|
|
break;
|
|
case cricket::MEDIA_TYPE_DATA:
|
|
RTC_NOTREACHED();
|
|
break;
|
|
case cricket::MEDIA_TYPE_UNSUPPORTED:
|
|
RTC_NOTREACHED();
|
|
break;
|
|
}
|
|
if (nativeParameters.clock_rate) {
|
|
_clockRate = [NSNumber numberWithInt:*nativeParameters.clock_rate];
|
|
}
|
|
if (nativeParameters.num_channels) {
|
|
_numChannels = [NSNumber numberWithInt:*nativeParameters.num_channels];
|
|
}
|
|
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
|
|
for (const auto ¶meter : nativeParameters.parameters) {
|
|
[parameters setObject:[NSString stringForStdString:parameter.second]
|
|
forKey:[NSString stringForStdString:parameter.first]];
|
|
}
|
|
_parameters = parameters;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (webrtc::RtpCodecParameters)nativeParameters {
|
|
webrtc::RtpCodecParameters parameters;
|
|
parameters.payload_type = _payloadType;
|
|
parameters.name = [NSString stdStringForString:_name];
|
|
// NSString pointer comparison is safe here since "kind" is readonly and only
|
|
// populated above.
|
|
if (_kind == kRTCMediaStreamTrackKindAudio) {
|
|
parameters.kind = cricket::MEDIA_TYPE_AUDIO;
|
|
} else if (_kind == kRTCMediaStreamTrackKindVideo) {
|
|
parameters.kind = cricket::MEDIA_TYPE_VIDEO;
|
|
} else {
|
|
RTC_NOTREACHED();
|
|
}
|
|
if (_clockRate != nil) {
|
|
parameters.clock_rate = absl::optional<int>(_clockRate.intValue);
|
|
}
|
|
if (_numChannels != nil) {
|
|
parameters.num_channels = absl::optional<int>(_numChannels.intValue);
|
|
}
|
|
for (NSString *paramKey in _parameters.allKeys) {
|
|
std::string key = [NSString stdStringForString:paramKey];
|
|
std::string value = [NSString stdStringForString:_parameters[paramKey]];
|
|
parameters.parameters[key] = value;
|
|
}
|
|
return parameters;
|
|
}
|
|
|
|
@end
|