mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
63ee39d0be
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}
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_DCHECK_NOTREACHED();
|
|
break;
|
|
case cricket::MEDIA_TYPE_UNSUPPORTED:
|
|
RTC_DCHECK_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_DCHECK_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
|