Use new RTCCameraVideoCapturer in AppRTCMobile.

webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m

 /*
  *  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 "ARDVideoCallViewController.h"
 
 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h"
 
 #import "ARDAppClient.h"
+#import "ARDCaptureController.h"
 #import "ARDSettingsModel.h"
 #import "ARDVideoCallView.h"
 #import "WebRTC/RTCAVFoundationVideoSource.h"
 #import "WebRTC/RTCDispatcher.h"
 #import "WebRTC/RTCLogging.h"
 #import "WebRTC/RTCMediaConstraints.h"
 
 @interface ARDVideoCallViewController () <ARDAppClientDelegate,
     ARDVideoCallViewDelegate>
-@property(nonatomic, strong) RTCVideoTrack *localVideoTrack;
+@property(nonatomic, strong) RTCCameraVideoCapturer *localCapturer;
 @property(nonatomic, strong) RTCVideoTrack *remoteVideoTrack;
 @property(nonatomic, readonly) ARDVideoCallView *videoCallView;
 @end
 
 @implementation ARDVideoCallViewController {
   ARDAppClient *_client;
   RTCVideoTrack *_remoteVideoTrack;
-  RTCVideoTrack *_localVideoTrack;
+  ARDCaptureController *_captureController;
   AVAudioSessionPortOverride _portOverride;
 }
 
+@synthesize localCapturer = _localCapturer;
 @synthesize videoCallView = _videoCallView;
-@synthesize localVideoTrack = _localVideoTrack;
 @synthesize remoteVideoTrack = _remoteVideoTrack;
 @synthesize delegate = _delegate;
 
 - (instancetype)initForRoom:(NSString *)room
                  isLoopback:(BOOL)isLoopback
                 isAudioOnly:(BOOL)isAudioOnly
           shouldMakeAecDump:(BOOL)shouldMakeAecDump
       shouldUseLevelControl:(BOOL)shouldUseLevelControl
                    delegate:(id<ARDVideoCallViewControllerDelegate>)delegate {
   if (self = [super init]) {
     ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init];
     _delegate = delegate;
+
     _client = [[ARDAppClient alloc] initWithDelegate:self];
     [_client connectToRoomWithId:room
                         settings:settingsModel
                       isLoopback:isLoopback
                      isAudioOnly:isAudioOnly
                shouldMakeAecDump:shouldMakeAecDump
            shouldUseLevelControl:shouldUseLevelControl];
   }
   return self;
 }
@@ skipping 29 matching lines @@
   RTCLog(@"ICE state changed: %ld", (long)state);
   __weak ARDVideoCallViewController *weakSelf = self;
   dispatch_async(dispatch_get_main_queue(), ^{
     ARDVideoCallViewController *strongSelf = weakSelf;
     strongSelf.videoCallView.statusLabel.text =
         [strongSelf statusTextForState:state];
   });
 }
 
 - (void)appClient:(ARDAppClient *)client
+    didCreateLocalCapturer:(RTCCameraVideoCapturer *)localCapturer {
+  ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init];
+  _captureController =
+      [[ARDCaptureController alloc] initWithCapturer:localCapturer settings:settingsModel];
+  [_captureController startCapture];

[daniela-webrtc, 2017/04/04 12:25:21]

I'd add [_capturerController stopCapture] in [self hangup] on line191 (and
adjust the interface of ARDCaptureController accordingly). Also this means we
can completely remove all references of the capturer in ARDAppClient as well :)

[sakal, 2017/04/05 12:35:49]

Done.

+}
+
+- (void)appClient:(ARDAppClient *)client
     didReceiveLocalVideoTrack:(RTCVideoTrack *)localVideoTrack {
-  self.localVideoTrack = localVideoTrack;
 }
 
 - (void)appClient:(ARDAppClient *)client
     didReceiveRemoteVideoTrack:(RTCVideoTrack *)remoteVideoTrack {
   self.remoteVideoTrack = remoteVideoTrack;
   _videoCallView.statusLabel.hidden = YES;
 }
 
 - (void)appClient:(ARDAppClient *)client
       didGetStats:(NSArray *)stats {
@@ skipping 11 matching lines @@
 
 #pragma mark - ARDVideoCallViewDelegate
 
 - (void)videoCallViewDidHangup:(ARDVideoCallView *)view {
   [self hangup];
 }
 
 - (void)videoCallViewDidSwitchCamera:(ARDVideoCallView *)view {
   // TODO(tkchin): Rate limit this so you can't tap continously on it.
   // Probably through an animation.
-  [self switchCamera];
+  [_captureController switchCamera];
 }
 
 - (void)videoCallViewDidChangeRoute:(ARDVideoCallView *)view {
   AVAudioSessionPortOverride override = AVAudioSessionPortOverrideNone;
   if (_portOverride == AVAudioSessionPortOverrideNone) {
     override = AVAudioSessionPortOverrideSpeaker;
   }
   [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeAudioSession
                                block:^{
     RTCAudioSession *session = [RTCAudioSession sharedInstance];
     [session lockForConfiguration];
     NSError *error = nil;
     if ([session overrideOutputAudioPort:override error:&error]) {
       _portOverride = override;
     } else {
       RTCLogError(@"Error overriding output port: %@",
                   error.localizedDescription);
     }
     [session unlockForConfiguration];
   }];
 }
 
 - (void)videoCallViewDidEnableStats:(ARDVideoCallView *)view {
   _client.shouldGetStats = YES;
   _videoCallView.statsView.hidden = NO;
 }
 
 #pragma mark - Private
 
-- (void)setLocalVideoTrack:(RTCVideoTrack *)localVideoTrack {
-  if (_localVideoTrack == localVideoTrack) {
+- (void)setLocalCapturer:(RTCCameraVideoCapturer *)localCapturer {

[daniela-webrtc, 2017/04/04 12:25:20]

I don't see this being called anywhere except on 193. Is this intentional?

[daniela-webrtc, 2017/04/04 12:25:21]

Also, we don't need to keep reference to the RTCCameraVideoCapturer here. We can
setup the captureSession but we don't need to keep ownership.

[sakal, 2017/04/05 12:35:49]

Done.

+  if (_localCapturer == localCapturer) {
     return;
   }
-  _localVideoTrack = nil;
-  _localVideoTrack = localVideoTrack;
-  RTCAVFoundationVideoSource *source = nil;
-  if ([localVideoTrack.source
-          isKindOfClass:[RTCAVFoundationVideoSource class]]) {
-    source = (RTCAVFoundationVideoSource*)localVideoTrack.source;
-  }
-  _videoCallView.localVideoView.captureSession = source.captureSession;
+  _localCapturer = localCapturer;
+  _videoCallView.localVideoView.captureSession = localCapturer.captureSession;
 }
 
 - (void)setRemoteVideoTrack:(RTCVideoTrack *)remoteVideoTrack {
   if (_remoteVideoTrack == remoteVideoTrack) {
     return;
   }
   [_remoteVideoTrack removeRenderer:_videoCallView.remoteVideoView];
   _remoteVideoTrack = nil;
   [_videoCallView.remoteVideoView renderFrame:nil];
   _remoteVideoTrack = remoteVideoTrack;
   [_remoteVideoTrack addRenderer:_videoCallView.remoteVideoView];
 }
 
 - (void)hangup {
   self.remoteVideoTrack = nil;
-  self.localVideoTrack = nil;
+  self.localCapturer = nil;
   [_client disconnect];
   [_delegate viewControllerDidFinish:self];
 }
 
-- (void)switchCamera {
-  RTCVideoSource* source = self.localVideoTrack.source;
-  if ([source isKindOfClass:[RTCAVFoundationVideoSource class]]) {
-    RTCAVFoundationVideoSource* avSource = (RTCAVFoundationVideoSource*)source;
-    avSource.useBackCamera = !avSource.useBackCamera;
-  }
-}
-
 - (NSString *)statusTextForState:(RTCIceConnectionState)state {
   switch (state) {
     case RTCIceConnectionStateNew:
     case RTCIceConnectionStateChecking:
       return @"Connecting...";
     case RTCIceConnectionStateConnected:
     case RTCIceConnectionStateCompleted:
     case RTCIceConnectionStateFailed:
     case RTCIceConnectionStateDisconnected:
     case RTCIceConnectionStateClosed:
@@ skipping 11 matching lines @@
   UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:@"OK"
                                                           style:UIAlertActionStyleDefault
                                                         handler:^(UIAlertAction *action){
                                                         }];
 
   [alert addAction:defaultAction];
   [self presentViewController:alert animated:YES completion:nil];
 }
 
 @end