Skip to content

refactor: support specific camera lenses #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2023
Merged

refactor: support specific camera lenses #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 31 additions & 14 deletions ios/ScannerViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,37 @@ - (void)toggleTorch

- (void)initCapture
{
self.device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
NSMutableArray *deviceTypes = [NSMutableArray array];

if (@available(iOS 13.0, *)) {
AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]
mediaType:AVMediaTypeVideo
position:AVCaptureDevicePositionBack];
[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTripleCamera];
[deviceTypes addObject:AVCaptureDeviceTypeBuiltInDualWideCamera];
[deviceTypes addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
}

if(@available(iOS 11.1, *)) {
[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTrueDepthCamera];
}

NSArray *captureDevices = [captureDeviceDiscoverySession devices];
if(@available(iOS 10.2, *)) {
[deviceTypes addObject:AVCaptureDeviceTypeBuiltInDualCamera];
}

if (captureDevices.count > 0) {
NSLog(@"Supports ultrawide camera");
if(@available(iOS 10.0, *)) {
[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTelephotoCamera];
[deviceTypes addObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
}

self.device = captureDevices[0];
}
AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:deviceTypes
mediaType:AVMediaTypeVideo
position:AVCaptureDevicePositionBack];

NSArray *captureDevices = [captureDeviceDiscoverySession devices];
if (captureDevices.count > 0) {
self.device = captureDevices[0];
} else {
self.device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
}

AVCaptureDeviceInput *captureInput = [AVCaptureDeviceInput deviceInputWithDevice:self.device error:nil];
Expand Down Expand Up @@ -226,7 +243,7 @@ - (void) onVideoStart: (NSNotification*) note
if ([self.device lockForConfiguration: &error]) {
if ([self.device isFocusModeSupported: AVCaptureFocusModeContinuousAutoFocus])
self.device.focusMode = AVCaptureFocusModeContinuousAutoFocus;

if ([self.device isExposureModeSupported: AVCaptureExposureModeContinuousAutoExposure])
self.device.exposureMode = AVCaptureExposureModeContinuousAutoExposure;
}
Expand Down Expand Up @@ -317,25 +334,25 @@ - (CIImage *)adjust:(CIImage *)ciImage
[filter setValue:ciImage forKey:kCIInputImageKey];
[filter setValue:[NSNumber numberWithFloat: saturation] forKey:kCIInputSaturationKey];
ciImage = [filter valueForKey:kCIOutputImageKey];

// shadow
CIFilter *shadowFilter = [CIFilter filterWithName:@"CIHighlightShadowAdjust"];
[shadowFilter setValue:ciImage forKey:kCIInputImageKey];
[shadowFilter setValue:[NSNumber numberWithFloat: shadow] forKey:@"inputShadowAmount"];
ciImage = [shadowFilter valueForKey:kCIOutputImageKey];

// contrast
CIFilter *contrastFilter = [CIFilter filterWithName:@"CIColorControls"];
[contrastFilter setValue:ciImage forKey:kCIInputImageKey];
[contrastFilter setValue:[NSNumber numberWithFloat: contrast] forKey:kCIInputContrastKey];
ciImage = [contrastFilter valueForKey:kCIOutputImageKey];

// brightness
CIFilter *brightnessFilter = [CIFilter filterWithName:@"CIColorControls"];
[brightnessFilter setValue:ciImage forKey:kCIInputImageKey];
[brightnessFilter setValue:[NSNumber numberWithFloat: brightness] forKey:kCIInputBrightnessKey];
ciImage = [brightnessFilter valueForKey:kCIOutputImageKey];

// sharpnessLuminance
CIFilter *sharpnessLuminanceFilter = [CIFilter filterWithName:@"CISharpenLuminance"];
[sharpnessLuminanceFilter setValue:ciImage forKey:kCIInputImageKey];
Expand Down