zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing crash in Mac client when no cameras are available.

Browse Source 
Bug: webrtc:8348
Change-Id: Ibf84ca76812d8c002fae9bd7bcf616abc53c78b1
Reviewed-on: https://webrtc-review.googlesource.com/7340
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Daniela Jovanoska Petrenko <denicija@webrtc.org>
Commit-Queue: Peter Hanspers <peterhanspers@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20392}
This commit is contained in:
Peter Hanspers
2017-10-23 14:30:25 +02:00
committed by Commit Bot
parent 93bc308f31
commit d92e0b5923
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/objc/AppRTCMobile/ARDCaptureController.m
View File

@ -11,6 +11,7 @@
#import "ARDCaptureController.h"
#import "ARDSettingsModel.h"
#import "WebRTC/RTCLogging.h"
@implementation ARDCaptureController {
RTCCameraVideoCapturer *_capturer;
@ -34,6 +35,14 @@
_usingFrontCamera ? AVCaptureDevicePositionFront : AVCaptureDevicePositionBack;
AVCaptureDevice *device = [self findDeviceForPosition:position];
AVCaptureDeviceFormat *format = [self selectFormatForDevice:device];
if (format == nil) {
RTCLogError(@"No valid formats for device %@", device);
NSAssert(NO, @"");
return;
}
NSInteger fps = [self selectFpsForFormat:format];
[_capturer startCaptureWithDevice:device format:format fps:fps];
@ -77,7 +86,6 @@
}
}
NSAssert(selectedFormat != nil, @"No suitable capture format found.");
return selectedFormat;
}