railbird/react-native-vision-camera
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix Code Type not supported error (#2022)

Browse Source
This commit is contained in:
Marc Rousavy 2023-10-17 11:55:11 +02:00 committed by GitHub
parent 4e1a1fd68b
commit 674d96706a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
package/ios/Core/CameraSession+Configuration.swift
View File

@ -68,9 +68,15 @@ extension CameraSession {
// Photo Output // Photo Output
if case let .enabled(photo) = configuration.photo { if case let .enabled(photo) = configuration.photo {
ReactLogger.log(level: .info, message: "Adding Photo output...") ReactLogger.log(level: .info, message: "Adding Photo output...")
let photoOutput = AVCapturePhotoOutput()
// 1. Configure // 1. Add
let photoOutput = AVCapturePhotoOutput()
guard captureSession.canAddOutput(photoOutput) else {
throw CameraError.parameter(.unsupportedOutput(outputDescriptor: "photo-output"))
}
captureSession.addOutput(photoOutput)
// 2. Configure
if photo.enableHighQualityPhotos { if photo.enableHighQualityPhotos {
// TODO: In iOS 16 this will be removed in favor of maxPhotoDimensions. // TODO: In iOS 16 this will be removed in favor of maxPhotoDimensions.
photoOutput.isHighResolutionCaptureEnabled = true photoOutput.isHighResolutionCaptureEnabled = true
@ -91,20 +97,21 @@ extension CameraSession {
photoOutput.isPortraitEffectsMatteDeliveryEnabled = photoOutput.isPortraitEffectsMatteDeliverySupported photoOutput.isPortraitEffectsMatteDeliveryEnabled = photoOutput.isPortraitEffectsMatteDeliverySupported
} }
// 2. Add
guard captureSession.canAddOutput(photoOutput) else {
throw CameraError.parameter(.unsupportedOutput(outputDescriptor: "photo-output"))
}
captureSession.addOutput(photoOutput)
self.photoOutput = photoOutput self.photoOutput = photoOutput
} }
// Video Output + Frame Processor // Video Output + Frame Processor
if case let .enabled(video) = configuration.video { if case let .enabled(video) = configuration.video {
ReactLogger.log(level: .info, message: "Adding Video Data output...") ReactLogger.log(level: .info, message: "Adding Video Data output...")
let videoOutput = AVCaptureVideoDataOutput()
// 1. Configure // 1. Add
let videoOutput = AVCaptureVideoDataOutput()
guard captureSession.canAddOutput(videoOutput) else {
throw CameraError.parameter(.unsupportedOutput(outputDescriptor: "video-output"))
}
captureSession.addOutput(videoOutput)
// 2. Configure
videoOutput.setSampleBufferDelegate(self, queue: CameraQueues.videoQueue) videoOutput.setSampleBufferDelegate(self, queue: CameraQueues.videoQueue)
videoOutput.alwaysDiscardsLateVideoFrames = true videoOutput.alwaysDiscardsLateVideoFrames = true
let pixelFormatType = try video.getPixelFormat(for: videoOutput) let pixelFormatType = try video.getPixelFormat(for: videoOutput)
@ -112,11 +119,6 @@ extension CameraSession {
String(kCVPixelBufferPixelFormatTypeKey): pixelFormatType, String(kCVPixelBufferPixelFormatTypeKey): pixelFormatType,
] ]
// 2. Add
guard captureSession.canAddOutput(videoOutput) else {
throw CameraError.parameter(.unsupportedOutput(outputDescriptor: "video-output"))
}
captureSession.addOutput(videoOutput)
self.videoOutput = videoOutput self.videoOutput = videoOutput
} }
@ -125,24 +127,27 @@ extension CameraSession {
ReactLogger.log(level: .info, message: "Adding Code Scanner output...") ReactLogger.log(level: .info, message: "Adding Code Scanner output...")
let codeScannerOutput = AVCaptureMetadataOutput() let codeScannerOutput = AVCaptureMetadataOutput()
// 1. Configure // 1. Add
guard captureSession.canAddOutput(codeScannerOutput) else {
throw CameraError.codeScanner(.notCompatibleWithOutputs)
}
captureSession.addOutput(codeScannerOutput)
// 2. Configure
let options = codeScanner.options let options = codeScanner.options
codeScannerOutput.setMetadataObjectsDelegate(self, queue: CameraQueues.codeScannerQueue)
try codeScanner.options.codeTypes.forEach { type in try codeScanner.options.codeTypes.forEach { type in
// CodeScanner::availableMetadataObjectTypes depends on the connection to the
// AVCaptureSession, so this list is only available after we add the output to the session.
if !codeScannerOutput.availableMetadataObjectTypes.contains(type) { if !codeScannerOutput.availableMetadataObjectTypes.contains(type) {
throw CameraError.codeScanner(.codeTypeNotSupported(codeType: type.descriptor)) throw CameraError.codeScanner(.codeTypeNotSupported(codeType: type.descriptor))
} }
} }
codeScannerOutput.setMetadataObjectsDelegate(self, queue: CameraQueues.codeScannerQueue)
codeScannerOutput.metadataObjectTypes = options.codeTypes codeScannerOutput.metadataObjectTypes = options.codeTypes
if let rectOfInterest = options.regionOfInterest { if let rectOfInterest = options.regionOfInterest {
codeScannerOutput.rectOfInterest = rectOfInterest codeScannerOutput.rectOfInterest = rectOfInterest
} }
// 2. Add
guard captureSession.canAddOutput(codeScannerOutput) else {
throw CameraError.codeScanner(.notCompatibleWithOutputs)
}
captureSession.addOutput(codeScannerOutput)
self.codeScannerOutput = codeScannerOutput self.codeScannerOutput = codeScannerOutput
} }