Fix memory leak issue

remirobert · Jul 9, 2017 · d8af584 · d8af584
1 parent eeb8a73
commit d8af584
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/CameraEngine/CameraEngine.swift b/CameraEngine/CameraEngine.swift
@@ -299,7 +299,8 @@ public class CameraEngine: NSObject {
 			if (!UIDevice.current.isGeneratingDeviceOrientationNotifications) {
 				UIDevice.current.beginGeneratingDeviceOrientationNotifications()
 			}
-            NotificationCenter.default.addObserver(forName: NSNotification.Name.UIDeviceOrientationDidChange, object: nil, queue: OperationQueue.main) { (_) -> Void in
+            NotificationCenter.default.addObserver(forName: NSNotification.Name.UIDeviceOrientationDidChange, object: nil, queue: OperationQueue.main) { [weak self] (_) -> Void in
+                guard let `self` = self else { return }
                 self.previewLayer.connection.videoOrientation = AVCaptureVideoOrientation.orientationFromUIDeviceOrientation(UIDevice.current.orientation)
             }
         }
@@ -468,15 +469,17 @@ public extension CameraEngine {
 
     public func startRecordingVideo(_ url: URL, blockCompletion: @escaping blockCompletionCaptureVideo) {
         if self.isRecording == false {
-            self.sessionQueue.async(execute: { () -> Void in
+            self.sessionQueue.async(execute: {[weak self] () -> Void in
+                guard let `self` = self else { return }
                 self.cameraOutput.startRecordVideo(blockCompletion, url: url)
             })
         }
     }
 
     public func stopRecordingVideo() {
         if self.isRecording {
-            self.sessionQueue.async(execute: { () -> Void in
+            self.sessionQueue.async(execute: {[weak self] () -> Void in
+                guard let `self` = self else { return }
                 self.cameraOutput.stopRecordVideo()
             })
         }

diff --git a/CameraEngine/CameraEngineVideoEncoder.swift b/CameraEngine/CameraEngineVideoEncoder.swift
@@ -150,7 +150,8 @@ class CameraEngineVideoEncoder {
         self.videoInputWriter.markAsFinished()
         self.audioInputWriter.markAsFinished()
 
-        self.assetWriter.finishWriting { () -> Void in
+        self.assetWriter.finishWriting {[weak self] () -> Void in
+            guard let `self` = self else { return }
             if let blockCompletion = blockCompletion {
                 blockCompletion(self.assetWriter.outputURL, nil)
             }

diff --git a/CameraEngineExample/CameraEngineExample/ViewController.swift b/CameraEngineExample/CameraEngineExample/ViewController.swift
@@ -118,13 +118,14 @@ class ViewController: UIViewController {
     @IBAction func takePhoto(_ sender: AnyObject) {
         switch self.mode {
         case .Photo:
-            self.cameraEngine.capturePhoto { (image , error) -> (Void) in
+            self.cameraEngine.capturePhoto {[weak self] (image , error) -> (Void) in
                 if let image = image {
                     CameraEngineFileManager.savePhoto(image, blockCompletion: { (success, error) -> (Void) in
+                        guard let `self` = self else { return }
                         if success {
                             let alertController =  UIAlertController(title: "Success, image saved !", message: nil, preferredStyle: .alert)
                             alertController.addAction(UIAlertAction(title: "Ok", style: .default, handler: nil))
-                            self.present(alertController, animated: true, completion: nil)
+                                self.present(alertController, animated: true, completion: nil)
                         }
                     })
                 }
@@ -133,9 +134,11 @@ class ViewController: UIViewController {
             if !self.cameraEngine.isRecording {
                 if let url = CameraEngineFileManager.temporaryPath("video.mp4") {
                     self.buttonTrigger.setTitle("stop recording", for: .normal)
-                    self.cameraEngine.startRecordingVideo(url, blockCompletion: { (url: URL?, error: NSError?) -> (Void) in
+                    self.cameraEngine.startRecordingVideo(url, blockCompletion: {[weak self] (url: URL?, error: NSError?) -> (Void) in
                         if let url = url {
                             DispatchQueue.main.async {
+                                guard let `self` = self else { return }
+
                                 self.buttonTrigger.setTitle("start recording", for: .normal)
                                 CameraEngineFileManager.saveVideo(url, blockCompletion: { (success: Bool, error: Error?) -> (Void) in
                                     if success {