Skip to content

Fix/start up delay #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bachino90 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/start up delay #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9bc560
Fix start up delay in iOS
bachino90 Jun 7, 2024
d116a7a
Try fix
bachino90 Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 89 additions & 83 deletions ios/Plugin/CameraController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,115 +61,121 @@ class CameraController: NSObject {
var hasRecognizeFace: Bool = false

var faceMetadataObjects = [AVMetadataFaceObject]()

private var disableAudio = true
private var cameraPosition = "front"
}

extension CameraController {
func prepare(cameraPosition: String, disableAudio: Bool, completionHandler: @escaping (Error?) -> Void) {
func createCaptureSession() {
self.captureSession = AVCaptureSession()
}
private func createCaptureSession() {
self.captureSession = AVCaptureSession()
}

func configureCaptureDevices() throws {
private func configureCaptureDevices() throws {

let session = AVCaptureDevice.DiscoverySession(deviceTypes: [.builtInWideAngleCamera], mediaType: AVMediaType.video, position: .unspecified)
let session = AVCaptureDevice.DiscoverySession(deviceTypes: [.builtInWideAngleCamera], mediaType: AVMediaType.video, position: .unspecified)

let cameras = session.devices.compactMap { $0 }
guard !cameras.isEmpty else { throw CameraControllerError.noCamerasAvailable }
let cameras = session.devices.compactMap { $0 }
guard !cameras.isEmpty else { throw CameraControllerError.noCamerasAvailable }

for camera in cameras {
if camera.position == .front {
self.frontCamera = camera
}
for camera in cameras {
if camera.position == .front {
self.frontCamera = camera
}

if camera.position == .back {
self.rearCamera = camera
if camera.position == .back {
self.rearCamera = camera

try camera.lockForConfiguration()
camera.focusMode = .continuousAutoFocus
camera.unlockForConfiguration()
}
}
if disableAudio == false {
self.audioDevice = AVCaptureDevice.default(for: AVMediaType.audio)
try camera.lockForConfiguration()
camera.focusMode = .continuousAutoFocus
camera.unlockForConfiguration()
}
}
if disableAudio == false {
self.audioDevice = AVCaptureDevice.default(for: AVMediaType.audio)
}
}

func configureDeviceInputs() throws {
guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
private func configureDeviceInputs() throws {
guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }

if cameraPosition == "rear" {
if let rearCamera = self.rearCamera {
self.rearCameraInput = try AVCaptureDeviceInput(device: rearCamera)
if cameraPosition == "rear" {
if let rearCamera = self.rearCamera {
self.rearCameraInput = try AVCaptureDeviceInput(device: rearCamera)

if captureSession.canAddInput(self.rearCameraInput!) { captureSession.addInput(self.rearCameraInput!) }
if captureSession.canAddInput(self.rearCameraInput!) { captureSession.addInput(self.rearCameraInput!) }

self.currentCameraPosition = .rear
}
} else if cameraPosition == "front" {
if let frontCamera = self.frontCamera {
self.frontCameraInput = try AVCaptureDeviceInput(device: frontCamera)
self.currentCameraPosition = .rear
}
} else if cameraPosition == "front" {
if let frontCamera = self.frontCamera {
self.frontCameraInput = try AVCaptureDeviceInput(device: frontCamera)

if captureSession.canAddInput(self.frontCameraInput!) { captureSession.addInput(self.frontCameraInput!) } else { throw CameraControllerError.inputsAreInvalid }
if captureSession.canAddInput(self.frontCameraInput!) { captureSession.addInput(self.frontCameraInput!) } else { throw CameraControllerError.inputsAreInvalid }

self.currentCameraPosition = .front
}
} else { throw CameraControllerError.noCamerasAvailable }

// Add audio input
if disableAudio == false {
if let audioDevice = self.audioDevice {
self.audioInput = try AVCaptureDeviceInput(device: audioDevice)
if captureSession.canAddInput(self.audioInput!) {
captureSession.addInput(self.audioInput!)
} else {
throw CameraControllerError.inputsAreInvalid
}
self.currentCameraPosition = .front
}
} else { throw CameraControllerError.noCamerasAvailable }

// Add audio input
if disableAudio == false {
if let audioDevice = self.audioDevice {
self.audioInput = try AVCaptureDeviceInput(device: audioDevice)
if captureSession.canAddInput(self.audioInput!) {
captureSession.addInput(self.audioInput!)
} else {
throw CameraControllerError.inputsAreInvalid
}
}
}
}

func configurePhotoOutput() throws {
guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }

self.photoOutput = AVCapturePhotoOutput()
self.photoOutput!.setPreparedPhotoSettingsArray([AVCapturePhotoSettings(format: [AVVideoCodecKey: AVVideoCodecType.jpeg])], completionHandler: nil)
self.photoOutput?.isHighResolutionCaptureEnabled = self.highResolutionOutput
if captureSession.canAddOutput(self.photoOutput!) { captureSession.addOutput(self.photoOutput!) }
captureSession.startRunning()
}

func configureDataOutput() throws {
guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
private func configurePhotoOutput() throws {
guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }

self.dataOutput = AVCaptureVideoDataOutput()
self.dataOutput?.videoSettings = [
(kCVPixelBufferPixelFormatTypeKey as String): NSNumber(value: kCVPixelFormatType_32BGRA as UInt32)
]
self.dataOutput?.alwaysDiscardsLateVideoFrames = true
if captureSession.canAddOutput(self.dataOutput!) {
captureSession.addOutput(self.dataOutput!)
}

self.metadataOutput = AVCaptureMetadataOutput()
if (enableFaceRecognition && captureSession.canAddOutput(self.metadataOutput!)) {
captureSession.addOutput(self.metadataOutput!)
self.metadataOutput!.metadataObjectTypes = [.face]
self.metadataOutput!.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
}
self.photoOutput = AVCapturePhotoOutput()
self.photoOutput!.setPreparedPhotoSettingsArray([AVCapturePhotoSettings(format: [AVVideoCodecKey: AVVideoCodecType.jpeg])], completionHandler: nil)
self.photoOutput?.isHighResolutionCaptureEnabled = self.highResolutionOutput
if captureSession.canAddOutput(self.photoOutput!) { captureSession.addOutput(self.photoOutput!) }
captureSession.startRunning()
}

captureSession.commitConfiguration()
private func configureDataOutput() throws {
guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }

let queue = DispatchQueue(label: "DataOutput", attributes: [])
self.dataOutput?.setSampleBufferDelegate(self, queue: queue)
self.dataOutput = AVCaptureVideoDataOutput()
self.dataOutput?.videoSettings = [
(kCVPixelBufferPixelFormatTypeKey as String): NSNumber(value: kCVPixelFormatType_32BGRA as UInt32)
]
self.dataOutput?.alwaysDiscardsLateVideoFrames = true
if captureSession.canAddOutput(self.dataOutput!) {
captureSession.addOutput(self.dataOutput!)
}

self.metadataOutput = AVCaptureMetadataOutput()
if (enableFaceRecognition && captureSession.canAddOutput(self.metadataOutput!)) {
captureSession.addOutput(self.metadataOutput!)
self.metadataOutput!.metadataObjectTypes = [.face]
self.metadataOutput!.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
}

DispatchQueue(label: "prepare").async {
captureSession.commitConfiguration()

let queue = DispatchQueue(label: "DataOutput", attributes: [])
self.dataOutput?.setSampleBufferDelegate(self, queue: queue)
}

func prepare(cameraPosition: String, disableAudio: Bool, completionHandler: @escaping (Error?) -> Void) {
self.cameraPosition = cameraPosition
// self.disableAudio = disableAudio

// DispatchQueue(label: "prepare").async {
do {
createCaptureSession()
try configureCaptureDevices()
try configureDeviceInputs()
try configurePhotoOutput()
try configureDataOutput()
self.createCaptureSession()
try self.configureCaptureDevices()
try self.configureDeviceInputs()
try self.configurePhotoOutput()
try self.configureDataOutput()
// try configureVideoOutput()
} catch {
DispatchQueue.main.async {
Expand All @@ -182,7 +188,7 @@ extension CameraController {
DispatchQueue.main.async {
completionHandler(nil)
}
}
// }
}

func displayPreview(on view: UIView) throws {
Expand Down
3 changes: 1 addition & 2 deletions ios/Plugin/Plugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class CameraPreview: CAPPlugin {
return
}

DispatchQueue.main.async {
DispatchQueue.global.async {
if self.cameraController.captureSession?.isRunning ?? false {
call.reject("camera already started")
} else {
Expand Down Expand Up @@ -105,7 +105,6 @@ public class CameraPreview: CAPPlugin {
}

call.resolve()

}
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@capacitor-community/camera-preview",
"version": "6.0.0",
"version": "6.0.1",
"description": "Camera preview",
"main": "dist/plugin.cjs.js",
"module": "dist/esm/index.js",
Expand Down