Explicitly retain self in objc blocks to avoid compiler warning.

Implicitly retaining self pointer (assuming this is intended behavior) causes compiler warning `-Wimplicit-retain-self`. We should do it explicitly. Bug: webrtc:9971 Change-Id: If77a67168d8a65ced78d5119b9a7332391d20bc9 Reviewed-on: https://webrtc-review.googlesource.com/c/109641 Commit-Queue: Jiawei Ou <ouj@fb.com> Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25609}
2018-11-09 13:55:45 -08:00
parent 0c32e33b48
commit 4aeb35b6d0
10 changed files with 248 additions and 208 deletions
--- a/examples/objc/AppRTCMobile/ARDAppClient.m
+++ b/examples/objc/AppRTCMobile/ARDAppClient.m
@ -400,7 +400,7 @@ static int const kKbpsMultiplier = 1000;
    didChangeIceConnectionState:(RTCIceConnectionState)newState {
  RTCLog(@"ICE state changed: %ld", (long)newState);
  dispatch_async(dispatch_get_main_queue(), ^{
-    [_delegate appClient:self didChangeConnectionState:newState];
+    [self.delegate appClient:self didChangeConnectionState:newState];
  });
 }

@ -450,16 +450,16 @@ static int const kKbpsMultiplier = 1000;
          [[NSError alloc] initWithDomain:kARDAppClientErrorDomain
                                     code:kARDAppClientErrorCreateSDP
                                 userInfo:userInfo];
-      [_delegate appClient:self didError:sdpError];
+      [self.delegate appClient:self didError:sdpError];
      return;
    }
    __weak ARDAppClient *weakSelf = self;
-    [_peerConnection setLocalDescription:sdp
-                       completionHandler:^(NSError *error) {
-                         ARDAppClient *strongSelf = weakSelf;
-                         [strongSelf peerConnection:strongSelf.peerConnection
-                             didSetSessionDescriptionWithError:error];
-                       }];
+    [self.peerConnection setLocalDescription:sdp
+                           completionHandler:^(NSError *error) {
+                             ARDAppClient *strongSelf = weakSelf;
+                             [strongSelf peerConnection:strongSelf.peerConnection
+                                 didSetSessionDescriptionWithError:error];
+                           }];
    ARDSessionDescriptionMessage *message =
        [[ARDSessionDescriptionMessage alloc] initWithDescription:sdp];
    [self sendSignalingMessage:message];
@ -480,22 +480,21 @@ static int const kKbpsMultiplier = 1000;
          [[NSError alloc] initWithDomain:kARDAppClientErrorDomain
                                     code:kARDAppClientErrorSetSDP
                                 userInfo:userInfo];
-      [_delegate appClient:self didError:sdpError];
+      [self.delegate appClient:self didError:sdpError];
      return;
    }
    // If we're answering and we've just set the remote offer we need to create
    // an answer and set the local description.
-    if (!_isInitiator && !_peerConnection.localDescription) {
+    if (!self.isInitiator && !self.peerConnection.localDescription) {
      RTCMediaConstraints *constraints = [self defaultAnswerConstraints];
      __weak ARDAppClient *weakSelf = self;
-      [_peerConnection answerForConstraints:constraints
-                          completionHandler:^(RTCSessionDescription *sdp,
-                                              NSError *error) {
-        ARDAppClient *strongSelf = weakSelf;
-        [strongSelf peerConnection:strongSelf.peerConnection
-            didCreateSessionDescription:sdp
-                                  error:error];
-      }];
+      [self.peerConnection answerForConstraints:constraints
+                              completionHandler:^(RTCSessionDescription *sdp, NSError *error) {
+                                ARDAppClient *strongSelf = weakSelf;
+                                [strongSelf peerConnection:strongSelf.peerConnection
+                                    didCreateSessionDescription:sdp
+                                                          error:error];
+                              }];
    }
  });
 }
--- a/examples/objc/AppRTCMobile/ARDStatsBuilder.m
+++ b/examples/objc/AppRTCMobile/ARDStatsBuilder.m
@ -167,23 +167,43 @@
  return deltaFramesEncoded != 0 ? deltaQPSum / deltaFramesEncoded : 0;
 }

+- (void)updateBweStatOfKey:(NSString *)key value:(NSString *)value {
+  if ([key isEqualToString:@"googAvailableSendBandwidth"]) {
+    _availableSendBw = [ARDBitrateTracker bitrateStringForBitrate:value.doubleValue];
+  } else if ([key isEqualToString:@"googAvailableReceiveBandwidth"]) {
+    _availableRecvBw = [ARDBitrateTracker bitrateStringForBitrate:value.doubleValue];
+  } else if ([key isEqualToString:@"googActualEncBitrate"]) {
+    _actualEncBitrate = [ARDBitrateTracker bitrateStringForBitrate:value.doubleValue];
+  } else if ([key isEqualToString:@"googTargetEncBitrate"]) {
+    _targetEncBitrate = [ARDBitrateTracker bitrateStringForBitrate:value.doubleValue];
+  }
+}
+
 - (void)parseBweStatsReport:(RTCLegacyStatsReport *)statsReport {
-  [statsReport.values enumerateKeysAndObjectsUsingBlock:^(
-      NSString *key, NSString *value, BOOL *stop) {
-    if ([key isEqualToString:@"googAvailableSendBandwidth"]) {
-      _availableSendBw =
-          [ARDBitrateTracker bitrateStringForBitrate:value.doubleValue];
-    } else if ([key isEqualToString:@"googAvailableReceiveBandwidth"]) {
-      _availableRecvBw =
-          [ARDBitrateTracker bitrateStringForBitrate:value.doubleValue];
-    } else if ([key isEqualToString:@"googActualEncBitrate"]) {
-      _actualEncBitrate =
-          [ARDBitrateTracker bitrateStringForBitrate:value.doubleValue];
-    } else if ([key isEqualToString:@"googTargetEncBitrate"]) {
-      _targetEncBitrate =
-          [ARDBitrateTracker bitrateStringForBitrate:value.doubleValue];
-    }
-  }];
+  [statsReport.values
+      enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
+        [self updateBweStatOfKey:key value:value];
+      }];
+}
+
+- (void)updateConnectionStatOfKey:(NSString *)key value:(NSString *)value {
+  if ([key isEqualToString:@"googRtt"]) {
+    _connRtt = value;
+  } else if ([key isEqualToString:@"googLocalCandidateType"]) {
+    _localCandType = value;
+  } else if ([key isEqualToString:@"googRemoteCandidateType"]) {
+    _remoteCandType = value;
+  } else if ([key isEqualToString:@"googTransportType"]) {
+    _transportType = value;
+  } else if ([key isEqualToString:@"bytesReceived"]) {
+    NSInteger byteCount = value.integerValue;
+    [_connRecvBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
+    _connRecvBitrate = _connRecvBitrateTracker.bitrateString;
+  } else if ([key isEqualToString:@"bytesSent"]) {
+    NSInteger byteCount = value.integerValue;
+    [_connSendBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
+    _connSendBitrate = _connSendBitrateTracker.bitrateString;
+  }
 }

 - (void)parseConnectionStatsReport:(RTCLegacyStatsReport *)statsReport {
@ -191,26 +211,10 @@
  if (![activeConnection isEqualToString:@"true"]) {
    return;
  }
-  [statsReport.values enumerateKeysAndObjectsUsingBlock:^(
-      NSString *key, NSString *value, BOOL *stop) {
-    if ([key isEqualToString:@"googRtt"]) {
-      _connRtt = value;
-    } else if ([key isEqualToString:@"googLocalCandidateType"]) {
-      _localCandType = value;
-    } else if ([key isEqualToString:@"googRemoteCandidateType"]) {
-      _remoteCandType = value;
-    } else if ([key isEqualToString:@"googTransportType"]) {
-      _transportType = value;
-    } else if ([key isEqualToString:@"bytesReceived"]) {
-      NSInteger byteCount = value.integerValue;
-      [_connRecvBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
-      _connRecvBitrate = _connRecvBitrateTracker.bitrateString;
-    } else if ([key isEqualToString:@"bytesSent"]) {
-      NSInteger byteCount = value.integerValue;
-      [_connSendBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
-      _connSendBitrate = _connSendBitrateTracker.bitrateString;
-    }
-  }];
+  [statsReport.values
+      enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
+        [self updateConnectionStatOfKey:key value:value];
+      }];
 }

 - (void)parseSendSsrcStatsReport:(RTCLegacyStatsReport *)statsReport {
@ -224,50 +228,58 @@
  }
 }

+- (void)updateAudioSendStatOfKey:(NSString *)key value:(NSString *)value {
+  if ([key isEqualToString:@"googCodecName"]) {
+    _audioSendCodec = value;
+  } else if ([key isEqualToString:@"bytesSent"]) {
+    NSInteger byteCount = value.integerValue;
+    [_audioSendBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
+    _audioSendBitrate = _audioSendBitrateTracker.bitrateString;
+  }
+}
+
 - (void)parseAudioSendStatsReport:(RTCLegacyStatsReport *)statsReport {
-  [statsReport.values enumerateKeysAndObjectsUsingBlock:^(
-      NSString *key, NSString *value, BOOL *stop) {
-    if ([key isEqualToString:@"googCodecName"]) {
-      _audioSendCodec = value;
-    } else if ([key isEqualToString:@"bytesSent"]) {
-      NSInteger byteCount = value.integerValue;
-      [_audioSendBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
-      _audioSendBitrate = _audioSendBitrateTracker.bitrateString;
-    }
-  }];
+  [statsReport.values
+      enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
+        [self updateAudioSendStatOfKey:key value:value];
+      }];
+}
+
+- (void)updateVideoSendStatOfKey:(NSString *)key value:(NSString *)value {
+  if ([key isEqualToString:@"googCodecName"]) {
+    _videoSendCodec = value;
+  } else if ([key isEqualToString:@"googFrameHeightInput"]) {
+    _videoInputHeight = value;
+  } else if ([key isEqualToString:@"googFrameWidthInput"]) {
+    _videoInputWidth = value;
+  } else if ([key isEqualToString:@"googFrameRateInput"]) {
+    _videoInputFps = value;
+  } else if ([key isEqualToString:@"googFrameHeightSent"]) {
+    _videoSendHeight = value;
+  } else if ([key isEqualToString:@"googFrameWidthSent"]) {
+    _videoSendWidth = value;
+  } else if ([key isEqualToString:@"googFrameRateSent"]) {
+    _videoSendFps = value;
+  } else if ([key isEqualToString:@"googAvgEncodeMs"]) {
+    _videoEncodeMs = value;
+  } else if ([key isEqualToString:@"bytesSent"]) {
+    NSInteger byteCount = value.integerValue;
+    [_videoSendBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
+    _videoSendBitrate = _videoSendBitrateTracker.bitrateString;
+  } else if ([key isEqualToString:@"qpSum"]) {
+    _oldVideoQPSum = _videoQPSum;
+    _videoQPSum = value.integerValue;
+  } else if ([key isEqualToString:@"framesEncoded"]) {
+    _oldFramesEncoded = _framesEncoded;
+    _framesEncoded = value.integerValue;
+  }
 }

 - (void)parseVideoSendStatsReport:(RTCLegacyStatsReport *)statsReport {
-  [statsReport.values enumerateKeysAndObjectsUsingBlock:^(
-      NSString *key, NSString *value, BOOL *stop) {
-    if ([key isEqualToString:@"googCodecName"]) {
-      _videoSendCodec = value;
-    } else if ([key isEqualToString:@"googFrameHeightInput"]) {
-      _videoInputHeight = value;
-    } else if ([key isEqualToString:@"googFrameWidthInput"]) {
-      _videoInputWidth = value;
-    } else if ([key isEqualToString:@"googFrameRateInput"]) {
-      _videoInputFps = value;
-    } else if ([key isEqualToString:@"googFrameHeightSent"]) {
-      _videoSendHeight = value;
-    } else if ([key isEqualToString:@"googFrameWidthSent"]) {
-      _videoSendWidth = value;
-    } else if ([key isEqualToString:@"googFrameRateSent"]) {
-      _videoSendFps = value;
-    } else if ([key isEqualToString:@"googAvgEncodeMs"]) {
-      _videoEncodeMs = value;
-    } else if ([key isEqualToString:@"bytesSent"]) {
-      NSInteger byteCount = value.integerValue;
-      [_videoSendBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
-      _videoSendBitrate = _videoSendBitrateTracker.bitrateString;
-    } else if ([key isEqualToString:@"qpSum"]) {
-      _oldVideoQPSum = _videoQPSum;
-      _videoQPSum = value.integerValue;
-    } else if ([key isEqualToString:@"framesEncoded"]) {
-      _oldFramesEncoded = _framesEncoded;
-      _framesEncoded = value.integerValue;
-    }
-  }];
+  [statsReport.values
+      enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
+        [self updateVideoSendStatOfKey:key value:value];
+      }];
 }

 - (void)parseRecvSsrcStatsReport:(RTCLegacyStatsReport *)statsReport {
@ -281,44 +293,52 @@
  }
 }

+- (void)updateAudioRecvStatOfKey:(NSString *)key value:(NSString *)value {
+  if ([key isEqualToString:@"googCodecName"]) {
+    _audioRecvCodec = value;
+  } else if ([key isEqualToString:@"bytesReceived"]) {
+    NSInteger byteCount = value.integerValue;
+    [_audioRecvBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
+    _audioRecvBitrate = _audioRecvBitrateTracker.bitrateString;
+  } else if ([key isEqualToString:@"googSpeechExpandRate"]) {
+    _audioExpandRate = value;
+  } else if ([key isEqualToString:@"googCurrentDelayMs"]) {
+    _audioCurrentDelay = value;
+  }
+}
+
 - (void)parseAudioRecvStatsReport:(RTCLegacyStatsReport *)statsReport {
-  [statsReport.values enumerateKeysAndObjectsUsingBlock:^(
-      NSString *key, NSString *value, BOOL *stop) {
-    if ([key isEqualToString:@"googCodecName"]) {
-      _audioRecvCodec = value;
-    } else if ([key isEqualToString:@"bytesReceived"]) {
-      NSInteger byteCount = value.integerValue;
-      [_audioRecvBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
-      _audioRecvBitrate = _audioRecvBitrateTracker.bitrateString;
-    } else if ([key isEqualToString:@"googSpeechExpandRate"]) {
-      _audioExpandRate = value;
-    } else if ([key isEqualToString:@"googCurrentDelayMs"]) {
-      _audioCurrentDelay = value;
-    }
-  }];
+  [statsReport.values
+      enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
+        [self updateAudioRecvStatOfKey:key value:value];
+      }];
+}
+
+- (void)updateVideoRecvStatOfKey:(NSString *)key value:(NSString *)value {
+  if ([key isEqualToString:@"googFrameHeightReceived"]) {
+    _videoRecvHeight = value;
+  } else if ([key isEqualToString:@"googFrameWidthReceived"]) {
+    _videoRecvWidth = value;
+  } else if ([key isEqualToString:@"googFrameRateReceived"]) {
+    _videoRecvFps = value;
+  } else if ([key isEqualToString:@"googFrameRateDecoded"]) {
+    _videoDecodedFps = value;
+  } else if ([key isEqualToString:@"googFrameRateOutput"]) {
+    _videoOutputFps = value;
+  } else if ([key isEqualToString:@"googDecodeMs"]) {
+    _videoDecodeMs = value;
+  } else if ([key isEqualToString:@"bytesReceived"]) {
+    NSInteger byteCount = value.integerValue;
+    [_videoRecvBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
+    _videoRecvBitrate = _videoRecvBitrateTracker.bitrateString;
+  }
 }

 - (void)parseVideoRecvStatsReport:(RTCLegacyStatsReport *)statsReport {
-  [statsReport.values enumerateKeysAndObjectsUsingBlock:^(
-      NSString *key, NSString *value, BOOL *stop) {
-    if ([key isEqualToString:@"googFrameHeightReceived"]) {
-      _videoRecvHeight = value;
-    } else if ([key isEqualToString:@"googFrameWidthReceived"]) {
-      _videoRecvWidth = value;
-    } else if ([key isEqualToString:@"googFrameRateReceived"]) {
-      _videoRecvFps = value;
-    } else if ([key isEqualToString:@"googFrameRateDecoded"]) {
-      _videoDecodedFps = value;
-    } else if ([key isEqualToString:@"googFrameRateOutput"]) {
-      _videoOutputFps = value;
-    } else if ([key isEqualToString:@"googDecodeMs"]) {
-      _videoDecodeMs = value;
-    } else if ([key isEqualToString:@"bytesReceived"]) {
-      NSInteger byteCount = value.integerValue;
-      [_videoRecvBitrateTracker updateBitrateWithCurrentByteCount:byteCount];
-      _videoRecvBitrate = _videoRecvBitrateTracker.bitrateString;
-    }
-  }];
+  [statsReport.values
+      enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
+        [self updateVideoRecvStatOfKey:key value:value];
+      }];
 }

@end
--- a/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
+++ b/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
@ -32,14 +32,17 @@ static NSString *const loopbackLaunchProcessArgument = @"loopback";
    ARDMainViewDelegate,
    ARDVideoCallViewControllerDelegate,
    RTCAudioSessionDelegate>
+@property(nonatomic, strong) ARDMainView *mainView;
+@property(nonatomic, strong) AVAudioPlayer *audioPlayer;
@end

@implementation ARDMainViewController {
-  ARDMainView *_mainView;
-  AVAudioPlayer *_audioPlayer;
  BOOL _useManualAudio;
 }

+@synthesize mainView = _mainView;
+@synthesize audioPlayer = _audioPlayer;
+
 - (void)viewDidLoad {
  [super viewDidLoad];
  if ([[[NSProcessInfo processInfo] arguments] containsObject:loopbackLaunchProcessArgument]) {
@ -165,13 +168,13 @@ static NSString *const loopbackLaunchProcessArgument = @"loopback";
  // Stop playback on main queue and then configure WebRTC.
  [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeMain
                               block:^{
-    if (_mainView.isAudioLoopPlaying) {
-      RTCLog(@"Stopping audio loop due to WebRTC start.");
-      [_audioPlayer stop];
-    }
-    RTCLog(@"Setting isAudioEnabled to YES.");
-    session.isAudioEnabled = YES;
-  }];
+                                 if (self.mainView.isAudioLoopPlaying) {
+                                   RTCLog(@"Stopping audio loop due to WebRTC start.");
+                                   [self.audioPlayer stop];
+                                 }
+                                 RTCLog(@"Setting isAudioEnabled to YES.");
+                                 session.isAudioEnabled = YES;
+                               }];
 }

 - (void)audioSessionDidStopPlayOrRecord:(RTCAudioSession *)session {
--- a/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
+++ b/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
@ -27,6 +27,7 @@
                                          RTCAudioSessionDelegate>
@property(nonatomic, strong) RTCVideoTrack *remoteVideoTrack;
@property(nonatomic, readonly) ARDVideoCallView *videoCallView;
+@property(nonatomic, assign) AVAudioSessionPortOverride portOverride;
@end

@implementation ARDVideoCallViewController {
@ -34,12 +35,12 @@
  RTCVideoTrack *_remoteVideoTrack;
  ARDCaptureController *_captureController;
  ARDFileCaptureController *_fileCaptureController NS_AVAILABLE_IOS(10);
-  AVAudioSessionPortOverride _portOverride;
 }

@synthesize videoCallView = _videoCallView;
@synthesize remoteVideoTrack = _remoteVideoTrack;
@synthesize delegate = _delegate;
+@synthesize portOverride = _portOverride;

 - (instancetype)initForRoom:(NSString *)room
                 isLoopback:(BOOL)isLoopback
@ -168,7 +169,7 @@
    [session lockForConfiguration];
    NSError *error = nil;
    if ([session overrideOutputAudioPort:override error:&error]) {
-      _portOverride = override;
+      self.portOverride = override;
    } else {
      RTCLogError(@"Error overriding output port: %@",
                  error.localizedDescription);
--- a/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
+++ b/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
@ -39,6 +39,7 @@ static NSUInteger const kBottomViewHeight = 200;
@property(nonatomic, weak) id<APPRTCMainViewDelegate> delegate;
@property(nonatomic, readonly) NSView<RTCVideoRenderer>* localVideoView;
@property(nonatomic, readonly) NSView<RTCVideoRenderer>* remoteVideoView;
+@property(nonatomic, readonly) NSTextView* logView;

 - (void)displayLogMessage:(NSString*)message;

@ -52,7 +53,6 @@ static NSUInteger const kBottomViewHeight = 200;
  NSButton* _connectButton;
  NSButton* _loopbackButton;
  NSTextField* _roomField;
-  NSTextView* _logView;
  CGSize _localVideoSize;
  CGSize _remoteVideoSize;
 }
@ -60,14 +60,13 @@ static NSUInteger const kBottomViewHeight = 200;
@synthesize delegate = _delegate;
@synthesize localVideoView = _localVideoView;
@synthesize remoteVideoView = _remoteVideoView;
-
+@synthesize logView = _logView;

 - (void)displayLogMessage:(NSString *)message {
  dispatch_async(dispatch_get_main_queue(), ^{
-    _logView.string =
-        [NSString stringWithFormat:@"%@%@\n", _logView.string, message];
-    NSRange range = NSMakeRange(_logView.string.length, 0);
-    [_logView scrollRangeToVisible:range];
+    self.logView.string = [NSString stringWithFormat:@"%@%@\n", self.logView.string, message];
+    NSRange range = NSMakeRange(self.logView.string.length, 0);
+    [self.logView scrollRangeToVisible:range];
  });
 }