Fixed Memory leaks when using the AVCaptureInput

Thanks to coremjs for the finds
nielswh · Oct 7, 2011 · f4822e0 · f4822e0
1 parent 327ce92
commit f4822e0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/ARKit/AugmentedRealityController.h b/ARKit/AugmentedRealityController.h
@@ -88,7 +88,6 @@
 - (void) setupDebugPostion;
 - (void) updateLocations;
 - (void) stopListening;
-- (void) unloadCamera;
 
 // Adding coordinates to the underlying data model.
 - (void)addCoordinate:(ARCoordinate *)coordinate augmentedView:(UIView *)agView animated:(BOOL)animated ;

diff --git a/ARKit/AugmentedRealityController.m b/ARKit/AugmentedRealityController.m
@@ -154,12 +154,19 @@ - (id)initWithViewController:(ARViewController *)vc {
 	return self;
 }
 
-- (IBAction)closeButtonClicked:(id)sender {
-    [[self rootViewController] dismissModalViewControllerAnimated:YES];
+-(void)unloadAV {
+    [captureSession stopRunning];
+    AVCaptureInput* input = [captureSession.inputs objectAtIndex:0];
+    [captureSession removeInput:input];
+    [[self previewLayer] removeFromSuperlayer];
+    [self setCaptureSession:nil];
+    [self setPreviewLayer:nil];	
 }
 
--(void) unloadCamera {
+- (IBAction)closeButtonClicked:(id)sender {
     [self stopListening];
+    [self unloadAV];
+    [[self rootViewController] dismissModalViewControllerAnimated:YES];
 }
 
 - (void)startListening {
@@ -528,8 +535,11 @@ - (void)setDebugMode:(BOOL)flag {
 }
 
 - (void)dealloc {
+    [self unloadAV];
 	[[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
     [ARView release];
+    locationManager.delegate = nil;
+    [UIAccelerometer sharedAccelerometer].delegate = nil;
 	[locationManager release];
 	[coordinateViews release];
 	[coordinates release];

diff --git a/ARKitDemo/Classes/MainViewController.m b/ARKitDemo/Classes/MainViewController.m
@@ -47,7 +47,8 @@ -(IBAction) displayAR:(id)sender {
         [self setCameraViewController:newCameraViewController];
         [newCameraViewController release];
         [cameraViewController setModalTransitionStyle: UIModalTransitionStyleFlipHorizontal];
-        [self presentModalViewController:cameraViewController animated:YES]; 
+        [self presentModalViewController:cameraViewController animated:YES];
+        newCameraViewController = nil;
     }
     else {
         UIViewController *newInfoViewController = [[UIViewController alloc] init];