optimise memory consumption

spoonconsulting · Jun 27, 2024 · 2a5d8dd · 2a5d8dd
1 parent e6c6e13
commit 2a5d8dd
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 39 deletions.
diff --git a/src/ios/CameraRenderController.h b/src/ios/CameraRenderController.h
@@ -23,5 +23,6 @@
 @property (nonatomic) CIContext *ciContext;
 @property (nonatomic) CIImage *latestFrame;
 @property (nonatomic) EAGLContext *context;
+@property (nonatomic) CVPixelBufferRef pixelBuffer;
 @property (nonatomic) NSLock *renderLock;
 @end
diff --git a/src/ios/CameraRenderController.m b/src/ios/CameraRenderController.m
@@ -21,7 +21,7 @@ - (void)loadView {
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
+    self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
     if (!self.context)
         NSLog(@"Failed to create ES context");
 
@@ -33,7 +33,7 @@ - (void)viewDidLoad {
 
     GLKView *view = (GLKView *)self.view;
     view.context = self.context;
-    view.drawableDepthFormat = GLKViewDrawableDepthFormat24;
+    view.drawableDepthFormat = GLKViewDrawableDepthFormatNone;
     view.contentMode = UIViewContentModeScaleToFill;
 
     glGenRenderbuffers(1, &_renderBuffer);
@@ -43,8 +43,8 @@ - (void)viewDidLoad {
 
 - (void) viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appplicationIsActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationEnteredForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
+    //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appplicationIsActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
+    //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationEnteredForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
 
     dispatch_async(self.sessionManager.sessionQueue, ^{
         if (!self.sessionManager.session.running){
@@ -58,8 +58,20 @@ - (void) viewWillAppear:(BOOL)animated {
 
 - (void) viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillEnterForegroundNotification object:nil];
+    //    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
+    //    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillEnterForegroundNotification object:nil];
+//    dispatch_async(self.sessionManager.sessionQueue, ^{
+//        NSLog(@"Stopping session");
+//        [self.sessionManager.session stopRunning];
+//    });
+    [self.view removeFromSuperview];
+    [EAGLContext setCurrentContext:nil];
+    self.context = nil;
+    if (_renderBuffer) {
+        glDeleteRenderbuffers(1, &_renderBuffer);
+        _renderBuffer = 0;
+    }
+    self.ciContext = nil;
 }
 
 - (void) appplicationIsActive:(NSNotification *)notification {
@@ -72,16 +84,24 @@ - (void) appplicationIsActive:(NSNotification *)notification {
 }
 
 - (void) applicationEnteredForeground:(NSNotification *)notification {
-    // dispatch_async(self.sessionManager.sessionQueue, ^{
-    //     NSLog(@"Stopping session");
-    //     [self.sessionManager.session stopRunning];
-    // });
+//    dispatch_async(self.sessionManager.sessionQueue, ^{
+//        NSLog(@"Stopping session");
+//        [self.sessionManager.session stopRunning];
+//    });
+    [self.view removeFromSuperview];
+    [EAGLContext setCurrentContext:nil];
+    self.context = nil;
+    if (_renderBuffer) {
+        glDeleteRenderbuffers(1, &_renderBuffer);
+        _renderBuffer = 0;
+    }
+    self.ciContext = nil;
 }
 
 -(void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnection *)connection {
     if ([self.renderLock tryLock]) {
-        CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)CMSampleBufferGetImageBuffer(sampleBuffer);
-        CIImage *image = [CIImage imageWithCVPixelBuffer:pixelBuffer];
+        _pixelBuffer = (CVPixelBufferRef)CMSampleBufferGetImageBuffer(sampleBuffer);
+        CIImage *image = [CIImage imageWithCVPixelBuffer:_pixelBuffer];
 
         __block CGRect frame;
         dispatch_sync(dispatch_get_main_queue(), ^{
@@ -150,32 +170,38 @@ -(void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CMS
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
 
-    if ([EAGLContext currentContext] == self.context) {
-        [EAGLContext setCurrentContext:nil];
-    }
+    [EAGLContext setCurrentContext:nil];
     self.context = nil;
+    if (_renderBuffer) {
+        glDeleteRenderbuffers(1, &_renderBuffer);
+        _renderBuffer = 0;
+    }
+    self.ciContext = nil;
 }
 
 - (void)dealloc {
-    if ([EAGLContext currentContext] == self.context) {
-        [EAGLContext setCurrentContext:nil];
-    }
+    [EAGLContext setCurrentContext:nil];
     self.context = nil;
+    if (_renderBuffer) {
+        glDeleteRenderbuffers(1, &_renderBuffer);
+        _renderBuffer = 0;
+    }
+    self.ciContext = nil;
 }
 
 - (BOOL)shouldAutorotate {
     return YES;
 }
 
--(void) viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
-    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
-    __block UIInterfaceOrientation toInterfaceOrientation;
-    [coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> context) {
-        toInterfaceOrientation = [self.sessionManager getOrientation];
-        
-    } completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
-        [self.sessionManager updateOrientation:[self.sessionManager getCurrentOrientation:toInterfaceOrientation]];
-    }];
-}
+//-(void) viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
+//    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+//    __block UIInterfaceOrientation toInterfaceOrientation;
+//    [coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+//        toInterfaceOrientation = [self.sessionManager getOrientation];
+//
+//    } completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+//        [self.sessionManager updateOrientation:[self.sessionManager getCurrentOrientation:toInterfaceOrientation]];
+//    }];
+//}
 
 @end
diff --git a/src/ios/CameraSessionManager.h b/src/ios/CameraSessionManager.h
@@ -10,6 +10,7 @@
 - (void) torchSwitch:(NSInteger)torchState;
 - (void) switchCameraTo:(NSString *)cameraMode completion:(void (^)(BOOL success))completion;
 - (BOOL) deviceHasUltraWideCamera;
+- (void) deallocSession;
 - (void) updateOrientation:(AVCaptureVideoOrientation)orientation;
 - (AVCaptureVideoOrientation) getCurrentOrientation:(UIInterfaceOrientation)toInterfaceOrientation;
 + (AVCaptureSessionPreset) calculateResolution:(NSInteger)targetSize;

diff --git a/src/ios/CameraSessionManager.m b/src/ios/CameraSessionManager.m
@@ -272,4 +272,18 @@ - (UIInterfaceOrientation) getOrientation {
     }
 }
 
+- (void)deallocSession {
+  if (self.session.running) {
+    [self.session stopRunning];
+  }
+  self.session = nil;
+  self.videoDeviceInput = nil;
+  self.imageOutput = nil;
+  self.dataOutput = nil;
+  self.filterLock = nil;
+  if (self.sessionQueue) {
+    self.sessionQueue = nil;
+  }
+}
+
 @end
diff --git a/src/ios/SimpleCameraPreview.m b/src/ios/SimpleCameraPreview.m
@@ -2,7 +2,7 @@
 #import <Cordova/CDV.h>
 #import <Cordova/CDVPlugin.h>
 #import <Cordova/CDVInvokedUrlCommand.h>
-@import CoreLocation; 
+@import CoreLocation;
 @import ImageIO;
 
 #import "SimpleCameraPreview.h"
@@ -59,7 +59,8 @@ - (void) enable:(CDVInvokedUrlCommand*)command {
     self.cameraRenderController.sessionManager = self.sessionManager;
     [self _setSize:command];
     [self.viewController addChildViewController:self.cameraRenderController];
-    [self.webView.superview insertSubview:self.cameraRenderController.view atIndex:0];
+    [self.webView.superview addSubview:self.cameraRenderController.view];
+    [self.cameraRenderController didMoveToParentViewController:self.viewController];
     self.viewController.view.backgroundColor = [UIColor blackColor];
 
     // Setup session
@@ -112,15 +113,17 @@ - (void) disable:(CDVInvokedUrlCommand*)command {
             for(AVCaptureOutput *output in self.sessionManager.session.outputs) {
                 [self.sessionManager.session removeOutput:output];
             }
-            [self.sessionManager.session stopRunning];
+            [self.sessionManager deallocSession];
             self.sessionManager = nil;
             dispatch_async(dispatch_get_main_queue(), ^{
-              [self.cameraRenderController.view removeFromSuperview];
-              if(self.viewController.parentViewController != nil) {
-                  [self.cameraRenderController removeFromParentViewController];
-              }
-              self.cameraRenderController = nil;
-              [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
+                [self.cameraRenderController willMoveToParentViewController:nil];
+                [self.cameraRenderController.view removeFromSuperview];
+                if(self.viewController.parentViewController != nil) {
+                    [self.cameraRenderController removeFromParentViewController];
+                }
+                self.cameraRenderController = nil;
+                [self deallocateMemory];
+                [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
             });
         }
         else {
@@ -183,8 +186,8 @@ - (void) deviceHasUltraWideCamera:(CDVInvokedUrlCommand *)command{
 
 - (void) deviceHasFlash:(CDVInvokedUrlCommand*)command{
     AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]
-                                          mediaType:AVMediaTypeVideo
-                                           position:AVCaptureDevicePositionBack];
+                                                                                                                            mediaType:AVMediaTypeVideo
+                                                                                                                             position:AVCaptureDevicePositionBack];
     NSArray *captureDevices = [captureDeviceDiscoverySession devices];
     BOOL hasTorch = NO;
 
@@ -346,4 +349,12 @@ - (void)runBlockWithTryCatch:(void (^)(void))block {
     }
 }
 
+- (void)deallocateMemory {
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:AVCaptureSessionWasInterruptedNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:AVCaptureSessionInterruptionEndedNotification object:nil];
+    [locationManager stopUpdatingLocation];
+    locationManager.delegate = nil;
+    locationManager = nil;
+}
+
 @end