chore: kickoff release

aws-amplify · Jan 10, 2024 · 7abab0f · 7abab0f
2 parents e6db58c + b28c192
commit 7abab0f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/Sources/FaceLiveness/AV/LivenessCaptureSession.swift b/Sources/FaceLiveness/AV/LivenessCaptureSession.swift
@@ -11,6 +11,7 @@ import AVFoundation
 class LivenessCaptureSession {
     let captureDevice: LivenessCaptureDevice
     private let captureQueue = DispatchQueue(label: "com.amazonaws.faceliveness.cameracapturequeue")
+    private let configurationQueue = DispatchQueue(label: "com.amazonaws.faceliveness.sessionconfiguration", qos: .userInitiated)
     let outputDelegate: AVCaptureVideoDataOutputSampleBufferDelegate
     var captureSession: AVCaptureSession?
 
@@ -43,6 +44,7 @@ class LivenessCaptureSession {
         else { throw LivenessCaptureSessionError.cameraUnavailable }
 
         let cameraInput = try AVCaptureDeviceInput(device: camera)
+        let videoOutput = AVCaptureVideoDataOutput()
 
         teardownExistingSession(input: cameraInput)
         captureSession = AVCaptureSession()
@@ -53,13 +55,10 @@ class LivenessCaptureSession {
 
         try setupInput(cameraInput, for: captureSession)
         captureSession.sessionPreset = captureDevice.preset
-
-        let videoOutput = AVCaptureVideoDataOutput()
         try setupOutput(videoOutput, for: captureSession)
-
         try captureDevice.configure()
 
-        DispatchQueue.global().async {
+        configurationQueue.async {
             captureSession.startRunning()
         }
 

diff --git a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionView.swift b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionView.swift
@@ -172,6 +172,9 @@ public struct FaceLivenessDetectorView: View {
                     UIScreen.main.brightness = 1.0
                 }
             }
+            .onDisappear() {
+                viewModel.stopRecording()
+            }
             .onReceive(viewModel.$livenessState) { output in
                 switch output.state {
                 case .completed:

diff --git a/Sources/FaceLiveness/Views/Liveness/LivenessViewController.swift b/Sources/FaceLiveness/Views/Liveness/LivenessViewController.swift
@@ -37,6 +37,12 @@ final class _LivenessViewController: UIViewController {
             }
         }
     }
+
+    deinit {
+        self.previewLayer.removeFromSuperlayer()
+        (self.previewLayer as? AVCaptureVideoPreviewLayer)?.session = nil
+        self.previewLayer = nil
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -110,6 +116,7 @@ extension _LivenessViewController: FaceLivenessViewControllerPresenter {
             imageView.frame = self.previewLayer.frame
             self.view.addSubview(imageView)
             self.previewLayer.removeFromSuperlayer()
+            (self.previewLayer as? AVCaptureVideoPreviewLayer)?.session = nil
             self.viewModel.stopRecording()
         }
     }

diff --git a/Tests/IntegrationTestApp/IntegrationTestAppUITests/LivenessIntegrationUITests.swift b/Tests/IntegrationTestApp/IntegrationTestAppUITests/LivenessIntegrationUITests.swift
@@ -26,11 +26,9 @@ class CreateLivenessSessionUITests: XCTestCase {
         Thread.sleep(forTimeInterval: 2)
         XCTAssert(app!.buttons[UIConstants.BeginCheck.primaryButton].exists)
         XCTAssertFalse(app!.buttons[UIConstants.primaryButton].exists)
-        let scrollViewsQuery = app!.scrollViews
-        let elementsQuery = scrollViewsQuery.otherElements
-        XCTAssertEqual(elementsQuery.staticTexts.element(boundBy: 1).label, UIConstants.BeginCheck.description)
-        XCTAssert(elementsQuery.buttons[UIConstants.BeginCheck.warning].exists)
-        XCTAssert(elementsQuery.staticTexts[UIConstants.BeginCheck.instruction].exists)
+        XCTAssert(app!.staticTexts[UIConstants.BeginCheck.warningTitle].exists)
+        XCTAssert(app!.staticTexts[UIConstants.BeginCheck.warningDescription].exists)
+        XCTAssert(app!.staticTexts[UIConstants.BeginCheck.instruction].exists)
     }
 
     func testStartLivenessIntegration() throws {
@@ -40,14 +38,11 @@ class CreateLivenessSessionUITests: XCTestCase {
         app?.buttons[UIConstants.primaryButton].tap()
         Thread.sleep(forTimeInterval: 2)
         XCTAssert(app!.buttons[UIConstants.BeginCheck.primaryButton].exists)
-        XCTAssertFalse(app!.buttons[UIConstants.primaryButton].exists)
         app!.buttons[UIConstants.BeginCheck.primaryButton].tap()
         Thread.sleep(forTimeInterval: 2)
-        XCTAssert(app!.staticTexts[UIConstants.LivenessCheck.countdownInstruction].exists)
         XCTAssert(app!.buttons[UIConstants.LivenessCheck.closeButton].exists)
-        Thread.sleep(forTimeInterval: 3)
         XCTAssert(app!.staticTexts[UIConstants.LivenessCheck.moveInstruction].exists)
-        Thread.sleep(forTimeInterval: 3)
+        Thread.sleep(forTimeInterval: 4)
         XCTAssert(app!.staticTexts[UIConstants.LivenessCheck.holdInstruction].exists)
         Thread.sleep(forTimeInterval: 8)
         XCTAssert(app!.buttons[UIConstants.LivenessResult.primaryButton].exists)

diff --git a/Tests/IntegrationTestApp/IntegrationTestAppUITests/UIConstants.swift b/Tests/IntegrationTestApp/IntegrationTestAppUITests/UIConstants.swift
@@ -10,14 +10,13 @@ struct UIConstants {
     static let primaryButton = "Create Liveness Session"
 
     struct BeginCheck {
-        static let primaryButton = "Begin Check"
-        static let description = "You will go through a face verification process to prove that you are a real person. Your screen's brightness will temporarily be set to 100% for highest accuracy."
-        static let warning = "Photosensitivity Warning, This check displays colored lights. Use caution if you are photosensitive."
-        static let instruction = "Follow the instructions to complete the check:"
+        static let primaryButton = "Start video check"
+        static let warningTitle = "Photosensitivity Warning"
+        static let warningDescription = "This check flashes different colors. Use caution if you are photosensitive."
+        static let instruction = "Center your face"
     }
 
     struct LivenessCheck {
-        static let countdownInstruction = "Hold face position during countdown."
         static let moveInstruction = "Move closer"
         static let holdInstruction = "Hold still"
         static let closeButton = "Close"