From e92b887a878ebdf5cd33bea39bac1cea879ad274 Mon Sep 17 00:00:00 2001
From: Tuan Pham <phantum@amazon.com>
Date: Mon, 4 Dec 2023 10:55:53 -0600
Subject: [PATCH 1/2] fix: send the final video event at a delayed time
 interval

---
 Sources/FaceLiveness/AV/VideoChunker.swift    | 10 ++++-----
 ...ctionViewModel+VideoSegmentProcessor.swift |  4 +++-
 .../FaceLivenessDetectionViewModel.swift      | 22 +------------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/Sources/FaceLiveness/AV/VideoChunker.swift b/Sources/FaceLiveness/AV/VideoChunker.swift
index 7e17e2f3..f70aca37 100644
--- a/Sources/FaceLiveness/AV/VideoChunker.swift
+++ b/Sources/FaceLiveness/AV/VideoChunker.swift
@@ -56,15 +56,13 @@ final class VideoChunker {
         }
 
         guard state == .writing else { return }
-        let timestamp = CMSampleBufferGetPresentationTimeStamp(buffer).seconds
-
-        if startTimeSeconds == nil { startTimeSeconds = timestamp }
-        guard let startTimeSeconds else {
-            return
-        }
 
         if assetWriterInput.isReadyForMoreMediaData {
             let timestamp = CMSampleBufferGetPresentationTimeStamp(buffer).seconds
+            if startTimeSeconds == nil { startTimeSeconds = timestamp }
+            guard let startTimeSeconds else {
+                return
+            }
             let presentationTime = CMTime(seconds: timestamp - startTimeSeconds, preferredTimescale: 600)
             guard let imageBuffer = buffer.imageBuffer else { return }
 
diff --git a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift
index 6ff107a4..a368ec66 100644
--- a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift
+++ b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift
@@ -13,7 +13,9 @@ extension FaceLivenessDetectionViewModel: VideoSegmentProcessor {
         sendVideoEvent(data: chunk, videoEventTime: .zero)
         if !hasSentFinalVideoEvent,
            case .completedDisplayingFreshness = livenessState.state {
-            sendFinalVideoChunk(data: chunk, videoEventTime: .zero)
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.9) {
+                self.sendFinalVideoEvent()
+            }
         }
     }
 }
diff --git a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel.swift b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel.swift
index 709ac49e..db1c2b87 100644
--- a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel.swift
+++ b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel.swift
@@ -289,27 +289,7 @@ class FaceLivenessDetectionViewModel: ObservableObject {
         }
     }
 
-    func sendVideoEvent(data: Data, videoEventTime: UInt64, n: UInt8 = 1) {
-        guard !hasSentFinalVideoEvent else { return }
-        let eventDate = Date()
-        let timestamp = eventDate.timestampMilliseconds
-
-        let videoEvent = VideoEvent.init(chunk: data, timestamp: timestamp)
-
-        do {
-            try livenessService?.send(
-                .video(event: videoEvent),
-                eventDate: { eventDate }
-            )
-        } catch {
-            DispatchQueue.main.async {
-                self.livenessState.unrecoverableStateEncountered(.unknown)
-            }
-        }
-    }
-
-    func sendFinalVideoChunk(data: Data, videoEventTime: UInt64) {
-        sendVideoEvent(data: data, videoEventTime: videoEventTime)
+    func sendFinalVideoEvent() {
         sendFinalEvent(
             targetFaceRect: faceGuideRect,
             viewSize: videoSize,

From 1fc807d7ab6d0a4e78d73339b78f8f1413f5ed4f Mon Sep 17 00:00:00 2001
From: Tuan Pham <phantum@amazon.com>
Date: Mon, 4 Dec 2023 12:55:51 -0600
Subject: [PATCH 2/2] update dispatching of final video event

---
 .../FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift
index a368ec66..c2ed2b39 100644
--- a/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift
+++ b/Sources/FaceLiveness/Views/Liveness/FaceLivenessDetectionViewModel+VideoSegmentProcessor.swift
@@ -13,7 +13,7 @@ extension FaceLivenessDetectionViewModel: VideoSegmentProcessor {
         sendVideoEvent(data: chunk, videoEventTime: .zero)
         if !hasSentFinalVideoEvent,
            case .completedDisplayingFreshness = livenessState.state {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.9) {
+            DispatchQueue.global(qos: .default).asyncAfter(deadline: .now() + 0.9) {
                 self.sendFinalVideoEvent()
             }
         }