Pass settings model to ARDAppClient instead of individual settings.

webrtc/examples/objc/AppRTCMobile/ARDAppClient.m

 /*
  *  Copyright 2014 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 "ARDAppClient+Internal.h"
 
 #import "WebRTC/RTCAVFoundationVideoSource.h"
 #import "WebRTC/RTCAudioTrack.h"
 #import "WebRTC/RTCConfiguration.h"
 #import "WebRTC/RTCFileLogger.h"
 #import "WebRTC/RTCIceServer.h"
 #import "WebRTC/RTCLogging.h"
 #import "WebRTC/RTCMediaConstraints.h"
 #import "WebRTC/RTCMediaStream.h"
 #import "WebRTC/RTCPeerConnectionFactory.h"
 #import "WebRTC/RTCRtpSender.h"
 #import "WebRTC/RTCTracing.h"
 
 #import "ARDAppEngineClient.h"
-#import "ARDTURNClient+Internal.h"
 #import "ARDJoinResponse.h"
 #import "ARDMessageResponse.h"
 #import "ARDSDPUtils.h"
+#import "ARDSettingsModel.h"
 #import "ARDSignalingMessage.h"
+#import "ARDTURNClient+Internal.h"
 #import "ARDUtilities.h"
 #import "ARDWebSocketChannel.h"
 #import "RTCIceCandidate+JSON.h"
 #import "RTCSessionDescription+JSON.h"
 
 static NSString * const kARDIceServerRequestUrl = @"https://appr.tc/params";
 
 static NSString * const kARDAppClientErrorDomain = @"ARDAppClient";
 static NSInteger const kARDAppClientErrorUnknown = -1;
 static NSInteger const kARDAppClientErrorRoomFull = -2;
@@ skipping 50 matching lines @@
 
 - (void)timerDidFire:(NSTimer *)timer {
   _timerHandler();
 }
 
 @end
 
 @implementation ARDAppClient {
   RTCFileLogger *_fileLogger;
   ARDTimerProxy *_statsTimer;
-  RTCMediaConstraints *_cameraConstraints;
-  NSNumber *_maxBitrate;
-  NSString *_videoCodec;
+  ARDSettingsModel *_settings;
 }
 
 @synthesize shouldGetStats = _shouldGetStats;
 @synthesize state = _state;
 @synthesize delegate = _delegate;
 @synthesize roomServerClient = _roomServerClient;
 @synthesize channel = _channel;
 @synthesize loopbackChannel = _loopbackChannel;
 @synthesize turnClient = _turnClient;
 @synthesize peerConnection = _peerConnection;
 @synthesize factory = _factory;
 @synthesize messageQueue = _messageQueue;
 @synthesize isTurnComplete = _isTurnComplete;
 @synthesize hasReceivedSdp  = _hasReceivedSdp;
 @synthesize roomId = _roomId;
 @synthesize clientId = _clientId;
 @synthesize isInitiator = _isInitiator;
 @synthesize iceServers = _iceServers;
 @synthesize webSocketURL = _websocketURL;
 @synthesize webSocketRestURL = _websocketRestURL;
 @synthesize defaultPeerConnectionConstraints =
     _defaultPeerConnectionConstraints;
 @synthesize isLoopback = _isLoopback;
 @synthesize isAudioOnly = _isAudioOnly;
 @synthesize shouldMakeAecDump = _shouldMakeAecDump;
 @synthesize shouldUseLevelControl = _shouldUseLevelControl;
 
 - (instancetype)init {
-  return [self initWithDelegate:nil preferVideoCodec:@"H264"];
+  return [self initWithDelegate:nil];
 }
 
-- (instancetype)initWithDelegate:(id<ARDAppClientDelegate>)delegate
-                preferVideoCodec:(NSString *)codec {
+- (instancetype)initWithDelegate:(id<ARDAppClientDelegate>)delegate {
   if (self = [super init]) {
     _roomServerClient = [[ARDAppEngineClient alloc] init];
     _delegate = delegate;
-    _videoCodec = codec;
     NSURL *turnRequestURL = [NSURL URLWithString:kARDIceServerRequestUrl];
     _turnClient = [[ARDTURNClient alloc] initWithURL:turnRequestURL];
     [self configure];
   }
   return self;
 }
 
 // TODO(tkchin): Provide signaling channel factory interface so we can recreate
 // channel if we need to on network failure. Also, make this the default public
 // constructor.
@@ skipping 55 matching lines @@
 
 - (void)setState:(ARDAppClientState)state {
   if (_state == state) {
     return;
   }
   _state = state;
   [_delegate appClient:self didChangeState:_state];
 }
 
 - (void)connectToRoomWithId:(NSString *)roomId
+                   settings:(ARDSettingsModel *)settings
                  isLoopback:(BOOL)isLoopback
                 isAudioOnly:(BOOL)isAudioOnly
           shouldMakeAecDump:(BOOL)shouldMakeAecDump
       shouldUseLevelControl:(BOOL)shouldUseLevelControl {
   NSParameterAssert(roomId.length);
   NSParameterAssert(_state == kARDAppClientStateDisconnected);
+  _settings = settings;
   _isLoopback = isLoopback;
   _isAudioOnly = isAudioOnly;
   _shouldMakeAecDump = shouldMakeAecDump;
   _shouldUseLevelControl = shouldUseLevelControl;
   self.state = kARDAppClientStateConnecting;
 
 #if defined(WEBRTC_IOS)
   if (kARDAppClientEnableTracing) {
     NSString *filePath = [self documentsFilePathForFileName:@"webrtc-trace.txt"];
     RTCStartInternalCapture(filePath);
@@ skipping 80 matching lines @@
 #endif
   _peerConnection = nil;
   self.state = kARDAppClientStateDisconnected;
 #if defined(WEBRTC_IOS)
   if (kARDAppClientEnableTracing) {
     RTCStopInternalCapture();
   }
 #endif
 }
 
-- (void)setCameraConstraints:(RTCMediaConstraints *)mediaConstraints {
-  _cameraConstraints = mediaConstraints;
-}
-
-- (void)setMaxBitrate:(NSNumber *)maxBitrate {
-  _maxBitrate = maxBitrate;
-}
-
 #pragma mark - ARDSignalingChannelDelegate
 
 - (void)channel:(id<ARDSignalingChannel>)channel
     didReceiveMessage:(ARDSignalingMessage *)message {
   switch (message.type) {
     case kARDSignalingMessageTypeOffer:
     case kARDSignalingMessageTypeAnswer:
       // Offers and answers must be processed before any other message, so we
       // place them at the front of the queue.
       _hasReceivedSdp = YES;
@@ skipping 111 matching lines @@
       NSError *sdpError =
           [[NSError alloc] initWithDomain:kARDAppClientErrorDomain
                                      code:kARDAppClientErrorCreateSDP
                                  userInfo:userInfo];
       [_delegate appClient:self didError:sdpError];
       return;
     }
     // Prefer codec from settings if available.
     RTCSessionDescription *sdpPreferringCodec =
         [ARDSDPUtils descriptionForDescription:sdp
-                           preferredVideoCodec:_videoCodec];
+                           preferredVideoCodec:[_settings currentVideoCodecSettingFromStore]];
     __weak ARDAppClient *weakSelf = self;
     [_peerConnection setLocalDescription:sdpPreferringCodec
                        completionHandler:^(NSError *error) {
       ARDAppClient *strongSelf = weakSelf;
       [strongSelf peerConnection:strongSelf.peerConnection
           didSetSessionDescriptionWithError:error];
     }];
     ARDSessionDescriptionMessage *message =
         [[ARDSessionDescriptionMessage alloc]
             initWithDescription:sdpPreferringCodec];
@@ skipping 133 matching lines @@
       message.type == kARDSignalingMessageTypeBye);
   switch (message.type) {
     case kARDSignalingMessageTypeOffer:
     case kARDSignalingMessageTypeAnswer: {
       ARDSessionDescriptionMessage *sdpMessage =
           (ARDSessionDescriptionMessage *)message;
       RTCSessionDescription *description = sdpMessage.sessionDescription;
       // Prefer codec from settings if available.
       RTCSessionDescription *sdpPreferringCodec =
           [ARDSDPUtils descriptionForDescription:description
-                             preferredVideoCodec:_videoCodec];
+                             preferredVideoCodec:[_settings currentVideoCodecSettingFromStore]];
       __weak ARDAppClient *weakSelf = self;
       [_peerConnection setRemoteDescription:sdpPreferringCodec
                           completionHandler:^(NSError *error) {
         ARDAppClient *strongSelf = weakSelf;
         [strongSelf peerConnection:strongSelf.peerConnection
             didSetSessionDescriptionWithError:error];
       }];
       break;
     }
     case kARDSignalingMessageTypeCandidate: {
@@ skipping 55 matching lines @@
     [_delegate appClient:self didReceiveLocalVideoTrack:track];
   }
 
   return sender;
 }
 
 - (void)setMaxBitrateForPeerConnectionVideoSender {
   for (RTCRtpSender *sender in _peerConnection.senders) {
     if (sender.track != nil) {
       if ([sender.track.kind isEqualToString:kARDVideoTrackKind]) {
-        [self setMaxBitrate:_maxBitrate forVideoSender:sender];
+        [self setMaxBitrate:[_settings currentMaxBitrateSettingFromStore] forVideoSender:sender];
       }
     }
   }
 }
 
 - (void)setMaxBitrate:(NSNumber *)maxBitrate forVideoSender:(RTCRtpSender *)sender {
   if (maxBitrate.intValue <= 0) {
     return;
   }
 
@@ skipping 65 matching lines @@
    NSString *valueLevelControl = _shouldUseLevelControl ?
        kRTCMediaConstraintsValueTrue : kRTCMediaConstraintsValueFalse;
    NSDictionary *mandatoryConstraints = @{ kRTCMediaConstraintsLevelControl : valueLevelControl };
    RTCMediaConstraints *constraints =
        [[RTCMediaConstraints alloc] initWithMandatoryConstraints:mandatoryConstraints
                                              optionalConstraints:nil];
    return constraints;
 }
 
 - (RTCMediaConstraints *)cameraConstraints {
-  return _cameraConstraints;
+  RTCMediaConstraints *cameraConstraints = [[RTCMediaConstraints alloc]
+      initWithMandatoryConstraints:nil
+               optionalConstraints:[_settings currentMediaConstraintFromStoreAsRTCDictionary]];
+  return cameraConstraints;
 }
 
 - (RTCMediaConstraints *)defaultAnswerConstraints {
   return [self defaultOfferConstraints];
 }
 
 - (RTCMediaConstraints *)defaultOfferConstraints {
   NSDictionary *mandatoryConstraints = @{
     @"OfferToReceiveAudio" : @"true",
     @"OfferToReceiveVideo" : @"true"
@@ skipping 69 matching lines @@
                                          code:kARDAppClientErrorInvalidRoom
                                      userInfo:@{
         NSLocalizedDescriptionKey: @"Invalid room.",
       }];
       break;
   }
   return error;
 }
 
 @end