Pass network config constraint as base64 to avoid mangling bytes

webrtc/sdk/objc/Framework/Classes/RTCMediaConstraints.mm

 /*
  *  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 "NSData+StdString.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);
@@ skipping 33 matching lines @@
 
 const MediaConstraintsInterface::Constraints&
 MediaConstraints::GetOptional() const {
   return optional_;
 }
 
 }  // namespace webrtc
 
 
 @implementation RTCMediaConstraints {
-  NSDictionary<NSString *, NSString *> *_mandatory;
-  NSDictionary<NSString *, NSString *> *_optional;
+  NSMutableDictionary<NSString *, NSObject *> *_mandatory;
+  NSMutableDictionary<NSString *, NSObject *> *_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];
+    _mandatory = [[NSMutableDictionary alloc] initWithDictionary:mandatory
+                                                       copyItems:YES];
+    _optional = [[NSMutableDictionary alloc] initWithDictionary:optional
+                                                      copyItems:YES];
   }
   return self;
 }
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"RTCMediaConstraints:\n%@\n%@",
                                     _mandatory,
                                     _optional];
 }
 
+- (void)addConstraintForKey:(NSString *)key
+                       data:(NSData *)data
+                isMandatory:(BOOL)isMandatory {
+  NSAssert(data, @"Invalid data.");
+  NSAssert(key.length, @"Invalid key.");
+  if (!data || !key.length) {
+    return;

[tkchin_webrtc, 2017/02/02 19:04:53]

nit: log error

[Chuck, 2017/02/03 15:55:50]

Gone in latest iteration.

+  }
+  if (isMandatory) {
+    _mandatory[key] = data;

[tkchin_webrtc, 2017/02/02 19:04:53]

might break mac build - make sure to run bots ( don't recall if we've moved to
10.8)

[Chuck, 2017/02/03 15:55:50]

Gone in latest iteration.

+  } else {
+    _optional[key] = data;
+  }
+}
+
 #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 {
+        (NSDictionary<NSString *, NSObject *> *)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);
-    nativeConstraints.push_back(webrtc::MediaConstraintsInterface::Constraint(
-        key.stdString, value.stdString));
+    // value must be either NSString or NSData.
+    NSObject *value = [constraints objectForKey:key];
+    if ([value isKindOfClass:[NSData class]]) {
+      NSData *data = (NSData *)value;
+      nativeConstraints.push_back(webrtc::MediaConstraintsInterface::Constraint(
+          key.stdString, data.stdString));
+    } else {

[tkchin_webrtc, 2017/02/02 19:04:53]

nit: safer to do an else if NSString then finally an else that asserts and
prints an error

[Chuck, 2017/02/03 15:55:51]

Gone in latest iteration.

+      NSAssert([value isKindOfClass:[NSString class]],
+               @"%@ is not an NSString.", value);
+      NSString *string = (NSString *)value;
+      nativeConstraints.push_back(webrtc::MediaConstraintsInterface::Constraint(
+          key.stdString, string.stdString));
+    }
   }
   return nativeConstraints;
 }
 
 @end