fix: Use CMSampleBuffer for now again

mrousavy · Jun 4, 2024 · 0791862 · 0791862
1 parent e299e3b
commit 0791862
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/package/ios/Core/CameraSession.swift b/package/ios/Core/CameraSession.swift
@@ -271,8 +271,7 @@ class CameraSession: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate, AVC
     // Call Frame Processor (delegate) for every Video Frame
     if captureOutput is AVCaptureVideoDataOutput {
       let orientation = connection.orientation
-      let frame = Frame(buffer: sampleBuffer, orientation: orientation.imageOrientation)
-      delegate?.onFrame(frame: frame)
+      delegate?.onFrame(sampleBuffer: sampleBuffer, orientation: orientation)
     }
 
     // Record Video Frame/Audio Sample to File in custom `RecordingSession` (AVAssetWriter)

diff --git a/package/ios/Core/CameraSessionDelegate.swift b/package/ios/Core/CameraSessionDelegate.swift
@@ -36,7 +36,7 @@ protocol CameraSessionDelegate: AnyObject {
   /**
    Called for every frame (if video or frameProcessor is enabled)
    */
-  func onFrame(frame: Frame)
+  func onFrame(sampleBuffer: CMSampleBuffer, orientation: Orientation)
   /**
    Called whenever a QR/Barcode has been scanned. Only if the CodeScanner Output is enabled
    */

diff --git a/package/ios/React/CameraView+TakeSnapshot.swift b/package/ios/React/CameraView+TakeSnapshot.swift
@@ -25,15 +25,14 @@ extension CameraView {
     }
 
     // Add a listener to the onFrame callbacks which will get called later if video is enabled.
-    snapshotOnFrameListeners.append { frame in
+    snapshotOnFrameListeners.append { buffer in
       if promise.didResolve {
         // capture was already aborted (timed out)
         return
       }
 
       self.onCaptureShutter(shutterType: .snapshot)
 
-      let buffer = frame.buffer
       guard let imageBuffer = CMSampleBufferGetImageBuffer(buffer) else {
         promise.reject(error: .capture(.imageDataAccessError))
         return

diff --git a/package/ios/React/CameraView.swift b/package/ios/React/CameraView.swift
@@ -96,7 +96,7 @@ public final class CameraView: UIView, CameraSessionDelegate, FpsSampleCollector
   // CameraView+Zoom
   var pinchGestureRecognizer: UIPinchGestureRecognizer?
   var pinchScaleOffset: CGFloat = 1.0
-  var snapshotOnFrameListeners: [(_: Frame) -> Void] = []
+  var snapshotOnFrameListeners: [(_: CMSampleBuffer) -> Void] = []
   private var currentConfigureCall: DispatchTime?
   private let fpsSampleCollector = FpsSampleCollector()
 
@@ -346,18 +346,19 @@ public final class CameraView: UIView, CameraSessionDelegate, FpsSampleCollector
     ])
   }
 
-  func onFrame(frame: Frame) {
+  func onFrame(sampleBuffer: CMSampleBuffer, orientation: Orientation) {
     fpsSampleCollector.onTick()
 
     #if VISION_CAMERA_ENABLE_FRAME_PROCESSORS
       if let frameProcessor = frameProcessor {
         // Call Frame Processor
+        let frame = Frame(buffer: sampleBuffer, orientation: orientation.imageOrientation)
         frameProcessor.call(frame)
       }
     #endif
 
     for callback in snapshotOnFrameListeners {
-      callback(frame)
+      callback(sampleBuffer)
     }
     snapshotOnFrameListeners.removeAll()
   }