Merge pull request #122 from seriyvolk83/audio_crash_fix

Fixing potential crash #101
AFathi · Dec 9, 2020 · b7e1fac · b7e1fac
2 parents 63c9ebb + 0c9a76a
commit b7e1fac
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ARVideoKit/Rendering/Writer/WritAR.swift b/ARVideoKit/Rendering/Writer/WritAR.swift
@@ -152,7 +152,7 @@ class WritAR: NSObject, AVCaptureAudioDataOutputSampleBufferDelegate {
         audioInput.expectsMediaDataInRealTime = true
 
         audioBufferQueue.async {
-            self.session.startRunning()
+            self.session?.startRunning()
         }
 
         if assetWriter.canAdd(audioInput) {
@@ -208,7 +208,10 @@ class WritAR: NSObject, AVCaptureAudioDataOutputSampleBufferDelegate {
     func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
         if let input = audioInput {
             audioBufferQueue.async { [weak self] in
-                if input.isReadyForMoreMediaData && (self?.isRecording)! {
+                if let isRecording = self?.isRecording,
+                    let session = self?.session,
+                    input.isReadyForMoreMediaData && isRecording
+                        && session.isRunning {
                     input.append(sampleBuffer)
                 }
             }
@@ -227,6 +230,7 @@ class WritAR: NSObject, AVCaptureAudioDataOutputSampleBufferDelegate {
         }
 
         if assetWriter.status == .writing {
+            isRecording = false
             assetWriter.finishWriting(completionHandler: finished)
         }
     }
@@ -237,6 +241,7 @@ class WritAR: NSObject, AVCaptureAudioDataOutputSampleBufferDelegate {
                 session.stopRunning()
             }
         }
+        isRecording = false
         assetWriter.cancelWriting()
     }
 }