bluewallet/react-native-camera
bluewallet/react-native-camera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ios): Reset cached exposure limits to avoid a crash. (#2948)

Browse Source 
Add exception handling to exposure updates just in case.

Co-authored-by: Cristiano Coelho <cristianocca@hotmail.com>
This commit is contained in:
cristianoccazinsp 2020-08-21 08:19:21 -03:00 committed by GitHub
parent 47637774a1
commit 7109ac7ab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ios/RN/RNCamera.m
View File

@ -76,7 +76,7 @@ BOOL _sessionInterrupted = NO;
self.previewLayer.needsDisplayOnBoundsChange = YES;
#endif
self.rectOfInterest = CGRectMake(0, 0, 1.0, 1.0);
UITapGestureRecognizer * tapHandler=[self createTapGestureRecognizer];
[self addGestureRecognizer:tapHandler];
UITapGestureRecognizer * doubleTabHandler=[self createDoubleTapGestureRecognizer];
@ -107,14 +107,14 @@ BOOL _sessionInterrupted = NO;
UITapGestureRecognizer *doubleTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleDoubleTap:)];
doubleTapGestureRecognizer.numberOfTapsRequired = 2;
return doubleTapGestureRecognizer;
}
-(UITapGestureRecognizer*)createTapGestureRecognizer
{
UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)];
tapGestureRecognizer.numberOfTapsRequired = 1;
return tapGestureRecognizer;
}
-(void)handleDoubleTap:(UITapGestureRecognizer*)doubleTapRecognizer {
[self handleTouch:doubleTapRecognizer isDoubleTap:true];
@ -389,7 +389,7 @@ BOOL _sessionInterrupted = NO;
RCTLogWarn(@"%s: device doesn't support flash mode", __func__);
return;
}
[self lockDevice:device andApplySettings:^{
if ([device isTorchActive]) {
[device setTorchMode:AVCaptureTorchModeOff];
@ -585,7 +585,7 @@ BOOL _sessionInterrupted = NO;
[self lockDevice:device andApplySettings:^{
float maxZoom = [self getMaxZoomFactor:device];
device.videoZoomFactor = (maxZoom - 1) * self.zoom + 1;
}];
}];
}
- (void)updateWhiteBalance {
@ -610,7 +610,7 @@ BOOL _sessionInterrupted = NO;
.tint = 0,
};
AVCaptureWhiteBalanceGains rgbGains = [device deviceWhiteBalanceGainsForTemperatureAndTintValues:temperatureAndTint];
@try{
[device setWhiteBalanceModeLockedWithDeviceWhiteBalanceGains:rgbGains completionHandler:nil];
}
@ -636,11 +636,11 @@ BOOL _sessionInterrupted = NO;
CGFloat redGain = rgbGains.redGain + self.customWhiteBalanceSettings.redGainOffset;
CGFloat greenGain = rgbGains.greenGain + self.customWhiteBalanceSettings.greenGainOffset;
CGFloat blueGain = rgbGains.blueGain + self.customWhiteBalanceSettings.blueGainOffset;
rgbGains.redGain = MAX(1.0f, MIN(device.maxWhiteBalanceGain, redGain));
rgbGains.greenGain = MAX(1.0f, MIN(device.maxWhiteBalanceGain, greenGain));
rgbGains.blueGain = MAX(1.0f, MIN(device.maxWhiteBalanceGain, blueGain));
@try{
[device setWhiteBalanceModeLockedWithDeviceWhiteBalanceGains:rgbGains completionHandler:nil];
} @catch(NSException *exception){
@ -690,7 +690,13 @@ BOOL _sessionInterrupted = NO;
}
// Only set the ISO for now, duration will be default as a change might affect frame rate.
[device setExposureModeCustomWithDuration:AVCaptureExposureDurationCurrent ISO:appliedExposure completionHandler:nil];
@try{
[device setExposureModeCustomWithDuration:AVCaptureExposureDurationCurrent ISO:appliedExposure completionHandler:nil];
}
@catch(NSException *exception){
RCTLogError(@"Failed to update exposure: %@", exception);
}
} else {
RCTLog(@"Device does not support AVCaptureExposureModeCustom");
}
@ -1508,6 +1514,13 @@ BOOL _sessionInterrupted = NO;
self.session.sessionPreset = [self getDefaultPreset];
// reset iso cached values, these might be different
// from camera to camera. Otherwise, the camera may crash
// when changing cameras and exposure.
self.exposureIsoMin = 0;
self.exposureIsoMax = 0;
if ([self.session canAddInput:captureDeviceInput]) {
[self.session addInput:captureDeviceInput];
@ -2222,7 +2235,7 @@ BOOL _sessionInterrupted = NO;
if (self.invertImageData) {
image = [RNImageUtils invertColors:image];
}
[self.barcodeDetector findBarcodesInFrame:image scaleX:scaleX scaleY:scaleY completed:^(NSArray * barcodes) {
NSDictionary *eventBarcode = @{@"type" : @"barcode", @"barcodes" : barcodes};
[self onBarcodesDetected:eventBarcode];