generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash and warning in AppRTCDemo

Browse Source 
Don't dismiss the presented view controller if it's already being dismissed to clear a warning about dismissing from a view controller while a dismiss is in progress.

Remove the sample buffer delegate when capture is being stopped to avoid a crash when a delegate method is sent to a deallocated object.

BUG=webrtc:4734
R=jiayl@webrtc.org, tkchin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/54669004.

Patch from Jon Hjelle <hjon@andyet.net>.

Cr-Commit-Position: refs/heads/master@{#9430}
This commit is contained in:
Jon Hjelle
2015-06-12 11:33:45 -07:00
committed by Zeke Chin
parent 372f2fcc59
commit 2f65ac1437
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
talk/app/webrtc/objc/avfoundationvideocapturer.mm
View File

@@ -142,6 +142,7 @@ static dispatch_queue_t kBackgroundQueue = nil;
if (!_isRunning) { if (!_isRunning) {
return; return;
} }
[_videoOutput setSampleBufferDelegate:nil queue:nullptr];
AVCaptureSession* session = _captureSession; AVCaptureSession* session = _captureSession;
dispatch_async(kBackgroundQueue, ^{ dispatch_async(kBackgroundQueue, ^{
[session stopRunning]; [session stopRunning];

2
talk/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m
View File

@@ -151,9 +151,11 @@
self.remoteVideoTrack = nil; self.remoteVideoTrack = nil;
self.localVideoTrack = nil; self.localVideoTrack = nil;
[_client disconnect]; [_client disconnect];
if (![self isBeingDismissed]) {
[self.presentingViewController dismissViewControllerAnimated:YES [self.presentingViewController dismissViewControllerAnimated:YES
completion:nil]; completion:nil];
} }
}
- (void)switchCamera { - (void)switchCamera {
RTCVideoSource* source = self.localVideoTrack.source; RTCVideoSource* source = self.localVideoTrack.source;