Reason for revert: Take three of relanding this after all internal issues have been resolved. Original issue's description: > Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ ) > > Reason for revert: > Breaks downstream project. > > Original issue's description: > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ ) > > > > Reason for revert: > > Take two of fixing downstream issues? > > > > Original issue's description: > > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ ) > > > > > > Reason for revert: > > > Still problems with downstream projects > > > > > > Original issue's description: > > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ ) > > > > > > > > Reason for revert: > > > > Fixing downstream breakages > > > > > > > > Original issue's description: > > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ ) > > > > > > > > > > Reason for revert: > > > > > Breaking downstream projects. > > > > > > > > > > Original issue's description: > > > > > > Split iOS sdk in to separate targets > > > > > > > > > > > > This CL splits the iOS sdk into separate static libraries for video, > > > > > > audio, ui, common, and peerconnection-related code. This will in the > > > > > > future make it easier to compile WebRTC without unneeded components. > > > > > > > > > > > > BUG=webrtc:4867 > > > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2862543002 > > > > > > Cr-Commit-Position: refs/heads/master@{#18166} > > > > > > Committed:52c83fe710> > > > > > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org > > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > > NOPRESUBMIT=true > > > > > NOTREECHECKS=true > > > > > NOTRY=true > > > > > BUG=webrtc:4867 > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2890513002 > > > > > Cr-Commit-Position: refs/heads/master@{#18170} > > > > > Committed:9756238084> > > > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > NOPRESUBMIT=true > > > > NOTREECHECKS=true > > > > NOTRY=true > > > > BUG=webrtc:4867 > > > > > > > > Review-Url: https://codereview.webrtc.org/2890733003 > > > > Cr-Commit-Position: refs/heads/master@{#18174} > > > > Committed:d51e042492> > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:4867 > > > > > > Review-Url: https://codereview.webrtc.org/2893593002 > > > Cr-Commit-Position: refs/heads/master@{#18182} > > > Committed:37144b214e> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:4867 > > > > Review-Url: https://codereview.webrtc.org/2893843003 > > Cr-Commit-Position: refs/heads/master@{#18303} > > Committed:580c3522d2> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:4867 > > Review-Url: https://codereview.webrtc.org/2911053002 > Cr-Commit-Position: refs/heads/master@{#18309} > Committed:af5c05540cTBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4867 Review-Url: https://codereview.webrtc.org/2913753003 Cr-Commit-Position: refs/heads/master@{#18319}
130 lines
4.8 KiB
Plaintext
130 lines
4.8 KiB
Plaintext
/*
|
|
* 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 "NSString+StdString.h"
|
|
|
|
#include <memory>
|
|
|
|
NSString * const kRTCMediaConstraintsMinAspectRatio =
|
|
@(webrtc::MediaConstraintsInterface::kMinAspectRatio);
|
|
NSString * const kRTCMediaConstraintsMaxAspectRatio =
|
|
@(webrtc::MediaConstraintsInterface::kMaxAspectRatio);
|
|
NSString * const kRTCMediaConstraintsMinWidth =
|
|
@(webrtc::MediaConstraintsInterface::kMinWidth);
|
|
NSString * const kRTCMediaConstraintsMaxWidth =
|
|
@(webrtc::MediaConstraintsInterface::kMaxWidth);
|
|
NSString * const kRTCMediaConstraintsMinHeight =
|
|
@(webrtc::MediaConstraintsInterface::kMinHeight);
|
|
NSString * const kRTCMediaConstraintsMaxHeight =
|
|
@(webrtc::MediaConstraintsInterface::kMaxHeight);
|
|
NSString * const kRTCMediaConstraintsMinFrameRate =
|
|
@(webrtc::MediaConstraintsInterface::kMinFrameRate);
|
|
NSString * const kRTCMediaConstraintsMaxFrameRate =
|
|
@(webrtc::MediaConstraintsInterface::kMaxFrameRate);
|
|
NSString * const kRTCMediaConstraintsLevelControl =
|
|
@(webrtc::MediaConstraintsInterface::kLevelControl);
|
|
NSString * const kRTCMediaConstraintsAudioNetworkAdaptorConfig =
|
|
@(webrtc::MediaConstraintsInterface::kAudioNetworkAdaptorConfig);
|
|
|
|
NSString * const kRTCMediaConstraintsValueTrue =
|
|
@(webrtc::MediaConstraintsInterface::kValueTrue);
|
|
NSString * const kRTCMediaConstraintsValueFalse =
|
|
@(webrtc::MediaConstraintsInterface::kValueFalse);
|
|
|
|
namespace webrtc {
|
|
|
|
MediaConstraints::~MediaConstraints() {}
|
|
|
|
MediaConstraints::MediaConstraints() {}
|
|
|
|
MediaConstraints::MediaConstraints(
|
|
const MediaConstraintsInterface::Constraints& mandatory,
|
|
const MediaConstraintsInterface::Constraints& optional)
|
|
: mandatory_(mandatory), optional_(optional) {}
|
|
|
|
const MediaConstraintsInterface::Constraints&
|
|
MediaConstraints::GetMandatory() const {
|
|
return mandatory_;
|
|
}
|
|
|
|
const MediaConstraintsInterface::Constraints&
|
|
MediaConstraints::GetOptional() const {
|
|
return optional_;
|
|
}
|
|
|
|
} // namespace webrtc
|
|
|
|
|
|
@implementation 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:@"RTCMediaConstraints:\n%@\n%@",
|
|
_mandatory,
|
|
_optional];
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (std::unique_ptr<webrtc::MediaConstraints>)nativeConstraints {
|
|
webrtc::MediaConstraintsInterface::Constraints mandatory =
|
|
[[self class] nativeConstraintsForConstraints:_mandatory];
|
|
webrtc::MediaConstraintsInterface::Constraints optional =
|
|
[[self class] nativeConstraintsForConstraints:_optional];
|
|
|
|
webrtc::MediaConstraints *nativeConstraints =
|
|
new webrtc::MediaConstraints(mandatory, optional);
|
|
return std::unique_ptr<webrtc::MediaConstraints>(nativeConstraints);
|
|
}
|
|
|
|
+ (webrtc::MediaConstraintsInterface::Constraints)
|
|
nativeConstraintsForConstraints:
|
|
(NSDictionary<NSString *, NSString *> *)constraints {
|
|
webrtc::MediaConstraintsInterface::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::MediaConstraintsInterface::Constraint(
|
|
key.stdString, configValue));
|
|
} else {
|
|
nativeConstraints.push_back(webrtc::MediaConstraintsInterface::Constraint(
|
|
key.stdString, value.stdString));
|
|
}
|
|
}
|
|
return nativeConstraints;
|
|
}
|
|
|
|
@end
|