added v11.4.8

Author: sMaltsevAcuant

AcuantCamera/AcuantCamera/Camera/Document/DocumentCameraController.swift

@@ -42,8 +42,8 @@ import AcuantCommon
     private var holdSteadyTimer: Timer!
 
     private let captureTime = 1
-    private let documentMovementThreshold = 45
-    private let previewBoundsThreshold: CGFloat = 25
+    private let documentMovementThreshold = 25
+    private let previewBoundsThreshold: CGFloat = -5
 
     private var currentStateCount = 0
     private var nextState = FrameResult.NO_DOCUMENT
@@ -131,7 +131,7 @@ import AcuantCommon
         self.captureSession = DocumentCaptureSession.getDocumentCaptureSession(delegate: self, frameDelegate: self, autoCaptureDelegate: self, captureDevice: captureDevice)
         self.captureSession.start()
         self.videoPreviewLayer = AVCaptureVideoPreviewLayer(session: self.captureSession)
-        self.videoPreviewLayer.videoGravity = AVLayerVideoGravity.resizeAspectFill
+        self.videoPreviewLayer.videoGravity = AVLayerVideoGravity.resizeAspect
         self.videoPreviewLayer.frame = self.view.layer.bounds
         self.videoPreviewLayer.connection?.videoOrientation = .portrait
 
@@ -158,8 +158,9 @@ import AcuantCommon
     }
 
     public func documentCaptured(image: UIImage, barcodeString: String?) {
-        let result = Image()
-        result.image = rotateImage(image: image)
+        let result = AcuantImagePreparation.createCameraImage(image: rotateImage(image: image), data: AcuantCameraMetaData().setCaptureType(captureType: autoCapture ? "AUTO" : "TAP"))
+        //result.image = rotateImage(image: image)
+        //result.captureType = autoCapture ? "AUTO" : "TAP"
         self.navigationController?.popViewController(animated: true)
         self.cameraCaptureDelegate?.setCapturedImage(image: result, barcodeString: barcodeString)
     }

AcuantCamera/AcuantCamera/Camera/Document/DocumentCaptureSession.swift

@@ -39,6 +39,13 @@ import AcuantImagePreparation
     private var devicePreviewResolutionLongerSide = CaptureConstants.CAMERA_PREVIEW_LONGER_SIDE_STANDARD
     weak private var frameDelegate:FrameAnalysisDelegate? = nil
 
+    public override init() {
+        super.init()
+        if #available(iOS 13.0, *) {
+            stillImageOutput.maxPhotoQualityPrioritization = .quality
+        }
+    }
+    
     public class func getDocumentCaptureSession(delegate:DocumentCaptureDelegate?, frameDelegate: FrameAnalysisDelegate, autoCaptureDelegate:AutoCaptureDelegate, captureDevice:AVCaptureDevice?)-> DocumentCaptureSession{
         return DocumentCaptureSession().getDocumentCaptureSession(delegate: delegate!, frameDelegate: frameDelegate, autoCaptureDelegate: autoCaptureDelegate,  captureDevice: captureDevice)
     }
@@ -259,15 +266,18 @@ import AcuantImagePreparation
 
     func capturePhoto() {
         let photoSetting = AVCapturePhotoSettings.init(format: [AVVideoCodecKey: AVVideoCodecType.jpeg])
-        photoSetting.isAutoStillImageStabilizationEnabled = true
+        if #available(iOS 13.0, *) {
+            photoSetting.photoQualityPrioritization = .quality
+        } else {
+            photoSetting.isAutoStillImageStabilizationEnabled = true
+        }
         self.stillImageOutput.capturePhoto(with: photoSetting, delegate: self)
     }
 
     func detectImage(image:UIImage)->Image?{
-        let croppingData  = CroppingData()
-        croppingData.image = image
+        let detectData  = DetectData.newInstance(image: image)
 
-        let croppedImage = AcuantImagePreparation.detect(data: croppingData)
+        let croppedImage = AcuantImagePreparation.detect(detectData: detectData)
         return croppedImage
     }
 }

AcuantCamera/AcuantCamera/Camera/Mrz/AcuantMrzCaptureSession.swift

@@ -185,10 +185,9 @@ import AcuantImagePreparation
     }
 
     func detectImage(image:UIImage)->Image?{
-        let croppingData  = CroppingData()
-        croppingData.image = image
+        let detectData  = DetectData.newInstance(image: image)
 
-        let croppedImage = AcuantImagePreparation.cropMrz(data: croppingData)
+        let croppedImage = AcuantImagePreparation.cropMrz(detectData: detectData)
         return croppedImage
     }
 }

AcuantFaceCapture/AcuantFaceCapture/AcuantFaceCaptureSession.swift

@@ -126,19 +126,25 @@ import AVFoundation
     }
 
     func isGoodSizeFace(face: CIFaceFeature, previewLayerSize:CGSize)-> AcuantFaceState{
-        let scale_min:CGFloat = 0.12
-        let scale_max:CGFloat = 0.5
-        let faceArea = face.bounds.width * face.bounds.height
-        let totalArea = previewLayerSize.width * previewLayerSize.height
+        let bounds = UIScreen.main.bounds
+        let width = bounds.size.width
+        let height = bounds.size.height
+        let screenRatio = max(width, height) / min(width, height)
+        let cameraRatio = max(previewLayerSize.width, previewLayerSize.height) / min(previewLayerSize.width, previewLayerSize.height)
 
-        if(faceArea < scale_min * totalArea){
-            return AcuantFaceState.FACE_TOO_FAR
+        let TOO_CLOSE_THRESH: CGFloat = 0.235 * screenRatio / cameraRatio
+        let TOO_FAR_THRESH: CGFloat = 0.385 * screenRatio / cameraRatio
+        let ratioToEdges = 1 - face.bounds.height/previewLayerSize.height
+        
+        
+        if (isFaceInBound(facePosition : face.bounds, previewLayerSize:previewLayerSize)){
+            return AcuantFaceState.FACE_NOT_IN_FRAME
         }
-        else if (faceArea > scale_max * totalArea){
+        else if (ratioToEdges < TOO_CLOSE_THRESH){
             return AcuantFaceState.FACE_TOO_CLOSE
         }
-        else if (isFaceInBound(facePosition : face.bounds, previewLayerSize:previewLayerSize)){
-            return AcuantFaceState.FACE_NOT_IN_FRAME
+        else if(ratioToEdges > TOO_FAR_THRESH){
+            return AcuantFaceState.FACE_TOO_FAR
         }
         else if (doesFaceHaveAngle(hasAnglePosition: face.hasFaceAngle, faceAngle: face.faceAngle)){
             return AcuantFaceState.FACE_HAS_ANGLE

AcuantiOSSDKV11.podspec

@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
     s.swift_versions = ['5.3.2']
     s.ios.deployment_target = '11.0'
     s.name         = "AcuantiOSSDKV11"
-    s.version      = "11.4.7"
+    s.version      = "11.4.8"
     s.summary      = "Acuant's latest SDK with most advanced image capture technology and optimized user workflow  "
     s.description  = "Acuant's latest SDK with most advanced image capture technology and optimized user workflow.
 

EmbeddedFrameworks/AcuantCommon.framework/AcuantCommon

@@ -362,15 +362,6 @@ SWIFT_CLASS("_TtC12AcuantCommon10Credential")
 + (void)setEndpointsWithEndpoints:(Endpoints * _Nonnull)endpoints;
 @end
 
-@class UIImage;
-
-SWIFT_CLASS("_TtC12AcuantCommon12CroppingData")
-@interface CroppingData : NSObject
-@property (nonatomic, strong) UIImage * _Nullable image;
-+ (CroppingData * _Nonnull)newInstance SWIFT_WARN_UNUSED_RESULT;
-- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
-@end
-
 typedef SWIFT_ENUM(NSInteger, DeleteType, open) {
   DeleteTypeID = 0,
   DeleteTypeMedicalCard = 1,
@@ -399,17 +390,21 @@ SWIFT_CLASS("_TtC12AcuantCommon9Endpoints")
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
+@class UIImage;
+@class NSMutableData;
 
 SWIFT_CLASS("_TtC12AcuantCommon5Image")
 @interface Image : NSObject
 @property (nonatomic, strong) UIImage * _Nullable image;
+@property (nonatomic, strong) NSMutableData * _Nullable data;
 @property (nonatomic) NSInteger dpi;
 @property (nonatomic, strong) AcuantError * _Nullable error;
 @property (nonatomic) BOOL isCorrectAspectRatio;
 @property (nonatomic) float aspectRatio;
 @property (nonatomic, copy) NSArray<NSValue *> * _Nonnull points;
 @property (nonatomic) BOOL isPassport;
 + (Image * _Nonnull)newInstance SWIFT_WARN_UNUSED_RESULT;
++ (Image * _Nonnull)newInstanceWithImage:(UIImage * _Nonnull)image data:(NSMutableData * _Nullable)data SWIFT_WARN_UNUSED_RESULT;
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end