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}
90 lines
3.6 KiB
Text
90 lines
3.6 KiB
Text
/*
|
|
* Copyright 2015 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 "RTCMediaConstraints+Private.h"
|
|
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
#include <memory>
|
|
|
|
NSString *const kRTCMediaConstraintsAudioNetworkAdaptorConfig =
|
|
@(webrtc::MediaConstraints::kAudioNetworkAdaptorConfig);
|
|
|
|
NSString *const kRTCMediaConstraintsIceRestart = @(webrtc::MediaConstraints::kIceRestart);
|
|
NSString *const kRTCMediaConstraintsOfferToReceiveAudio =
|
|
@(webrtc::MediaConstraints::kOfferToReceiveAudio);
|
|
NSString *const kRTCMediaConstraintsOfferToReceiveVideo =
|
|
@(webrtc::MediaConstraints::kOfferToReceiveVideo);
|
|
NSString *const kRTCMediaConstraintsVoiceActivityDetection =
|
|
@(webrtc::MediaConstraints::kVoiceActivityDetection);
|
|
|
|
NSString *const kRTCMediaConstraintsValueTrue = @(webrtc::MediaConstraints::kValueTrue);
|
|
NSString *const kRTCMediaConstraintsValueFalse = @(webrtc::MediaConstraints::kValueFalse);
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCMediaConstraints) {
|
|
NSDictionary<NSString *, NSString *> *_mandatory;
|
|
NSDictionary<NSString *, NSString *> *_optional;
|
|
}
|
|
|
|
- (instancetype)initWithMandatoryConstraints:
|
|
(NSDictionary<NSString *, NSString *> *)mandatory
|
|
optionalConstraints:
|
|
(NSDictionary<NSString *, NSString *> *)optional {
|
|
if (self = [super init]) {
|
|
_mandatory = [[NSDictionary alloc] initWithDictionary:mandatory
|
|
copyItems:YES];
|
|
_optional = [[NSDictionary alloc] initWithDictionary:optional
|
|
copyItems:YES];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (NSString *)description {
|
|
return [NSString
|
|
stringWithFormat:@"RTC_OBJC_TYPE(RTCMediaConstraints):\n%@\n%@", _mandatory, _optional];
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (std::unique_ptr<webrtc::MediaConstraints>)nativeConstraints {
|
|
webrtc::MediaConstraints::Constraints mandatory =
|
|
[[self class] nativeConstraintsForConstraints:_mandatory];
|
|
webrtc::MediaConstraints::Constraints optional =
|
|
[[self class] nativeConstraintsForConstraints:_optional];
|
|
|
|
webrtc::MediaConstraints *nativeConstraints =
|
|
new webrtc::MediaConstraints(mandatory, optional);
|
|
return std::unique_ptr<webrtc::MediaConstraints>(nativeConstraints);
|
|
}
|
|
|
|
+ (webrtc::MediaConstraints::Constraints)nativeConstraintsForConstraints:
|
|
(NSDictionary<NSString *, NSString *> *)constraints {
|
|
webrtc::MediaConstraints::Constraints nativeConstraints;
|
|
for (NSString *key in constraints) {
|
|
NSAssert([key isKindOfClass:[NSString class]],
|
|
@"%@ is not an NSString.", key);
|
|
NSString *value = [constraints objectForKey:key];
|
|
NSAssert([value isKindOfClass:[NSString class]],
|
|
@"%@ is not an NSString.", value);
|
|
if ([kRTCMediaConstraintsAudioNetworkAdaptorConfig isEqualToString:key]) {
|
|
// This value is base64 encoded.
|
|
NSData *charData = [[NSData alloc] initWithBase64EncodedString:value options:0];
|
|
std::string configValue =
|
|
std::string(reinterpret_cast<const char *>(charData.bytes), charData.length);
|
|
nativeConstraints.push_back(webrtc::MediaConstraints::Constraint(key.stdString, configValue));
|
|
} else {
|
|
nativeConstraints.push_back(
|
|
webrtc::MediaConstraints::Constraint(key.stdString, value.stdString));
|
|
}
|
|
}
|
|
return nativeConstraints;
|
|
}
|
|
|
|
@end
|