ios: handle audio media constraints

Author: davidliu

android/src/main/java/com/oney/WebRTCModule/GetUserMediaImpl.java

@@ -95,12 +95,24 @@ private AudioTrack createAudioTrack(ReadableMap constraints) {
         PeerConnectionFactory pcFactory = webRTCModule.mFactory;
         MediaConstraints peerConstraints = webRTCModule.constraintsForOptions(audioConstraintsMap);
 
+        // Convert given constraints into the internal webrtc media constraints.
         // Default to on if not specified.
-        // MediaConstraints uses first value it finds.
-        peerConstraints.optional.add(new MediaConstraints.KeyValuePair("googAutoGainControl", "true"));
-        peerConstraints.optional.add(new MediaConstraints.KeyValuePair("googNoiseSuppression", "true"));
-        peerConstraints.optional.add(new MediaConstraints.KeyValuePair("googEchoCancellation", "true"));
-        peerConstraints.optional.add(new MediaConstraints.KeyValuePair("googHighpassFilter", "true"));
+        peerConstraints.optional.add(new MediaConstraints.KeyValuePair("googAutoGainControl",
+                audioConstraintsMap.hasKey("audioGainControl")
+                        ? audioConstraintsMap.getDynamic("autoGainControl").asString()
+                        : "true"));
+        peerConstraints.optional.add(new MediaConstraints.KeyValuePair("googNoiseSuppression",
+                audioConstraintsMap.hasKey("noiseSuppression")
+                        ? audioConstraintsMap.getDynamic("noiseSuppression").asString()
+                        : "true"));
+        peerConstraints.optional.add(new MediaConstraints.KeyValuePair("googEchoCancellation",
+                audioConstraintsMap.hasKey("echoCancellation")
+                        ? audioConstraintsMap.getDynamic("echoCancellation").asString()
+                        : "true"));
+        peerConstraints.optional.add(new MediaConstraints.KeyValuePair("googHighpassFilter",
+                audioConstraintsMap.hasKey("highpassFilter")
+                        ? audioConstraintsMap.getDynamic("highpassFilter").asString()
+                        : "true"));
 
         // PeerConnectionFactory.createAudioSource will throw an error when mandatory constraints contain nulls.
         // so, let's check for nulls

android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java

@@ -512,33 +512,6 @@ MediaConstraints constraintsForOptions(ReadableMap options) {
             mediaConstraints.mandatory.add(new MediaConstraints.KeyValuePair(key, value));
         }
 
-        ReadableMapKeySetIterator audioKeyIterator = options.keySetIterator();
-
-        while (audioKeyIterator.hasNextKey()) {
-            String key = audioKeyIterator.nextKey();
-            String value = ReactBridgeUtil.getMapStrValue(options, key);
-            String googKey = null;
-            switch (key) {
-                case "autoGainControl":
-                    googKey = "googAutoGainControl";
-                    break;
-                case "noiseSuppression":
-                case "voiceIsolation":
-                    googKey = "googNoiseSuppression";
-                    break;
-                case "echoCancellation":
-                    googKey = "googEchoCancellation";
-                    break;
-                case "highpassFilter":
-                    googKey = "googHighpassFilter";
-                    break;
-                default:
-                    break;
-            }
-            if (googKey != null) {
-                mediaConstraints.optional.add(new MediaConstraints.KeyValuePair(googKey, value));
-            }
-        }
         return mediaConstraints;
     }
 

ios/RCTWebRTC/WebRTCModule+RTCMediaStream.m

@@ -29,6 +29,10 @@ - (void)setVideoEffectProcessor:(VideoEffectProcessor *)videoEffectProcessor {
 
 #pragma mark - getUserMedia
 
+- (NSString *)convertBoolToString:(id)value {
+    return value ? @"true" : @"false";
+}
+
 /**
  * Initializes a new {@link RTCAudioTrack} which satisfies the given constraints.
  *
@@ -37,7 +41,26 @@ - (void)setVideoEffectProcessor:(VideoEffectProcessor *)videoEffectProcessor {
  */
 - (RTCAudioTrack *)createAudioTrack:(NSDictionary *)constraints {
     NSString *trackId = [[NSUUID UUID] UUIDString];
-    RTCAudioTrack *audioTrack = [self.peerConnectionFactory audioTrackWithTrackId:trackId];
+    NSDictionary *audioConstraints = constraints[@"audio"];
+    NSMutableDictionary *optionalConstraints = [NSMutableDictionary dictionary];
+    optionalConstraints[@"googAutoGainControl"] = audioConstraints[@"autoGainControl"] != nil
+                                                      ? [self convertBoolToString:audioConstraints[@"autoGainControl"]]
+                                                      : @"false";
+    optionalConstraints[@"googNoiseSuppression"] =
+        audioConstraints[@"noiseSuppression"] != nil ? [self convertBoolToString:audioConstraints[@"noiseSuppression"]]
+                                                     : @"false";
+    optionalConstraints[@"googEchoCancellation"] =
+        audioConstraints[@"echoCancellation"] != nil ? [self convertBoolToString:audioConstraints[@"echoCancellation"]]
+                                                     : @"false";
+    optionalConstraints[@"googHighpassFilter"] = audioConstraints[@"highpassFilter"] != nil
+                                                     ? [self convertBoolToString:audioConstraints[@"highpassFilter"]]
+                                                     : @"false";
+
+    RTCMediaConstraints *mediaConstraints =
+        [[RTCMediaConstraints alloc] initWithMandatoryConstraints:nil optionalConstraints:optionalConstraints];
+
+    RTCAudioSource *audioSource = [self.peerConnectionFactory audioSourceWithConstraints:mediaConstraints];
+    RTCAudioTrack *audioTrack = [self.peerConnectionFactory audioTrackWithSource:audioSource trackId:trackId];
     return audioTrack;
 }
 /**