Merge branch 'video-single-cb-android' of github.com:spoonconsulting/…

…cordova-plugin-simple-camera-preview into video-single-cb-android

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [2.0.22](https://github.com/spoonconsulting/cordova-plugin-simple-camera-preview/compare/v2.0.21...v2.0.22) (2024-07-12)
+* **iOS:** Release memory when exiting capture preview
+
 ## [2.0.21](https://github.com/spoonconsulting/cordova-plugin-simple-camera-preview/compare/v2.0.20...v2.0.21) (2024-07-05)
 * **iOS:** Release memory consumption
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoonconsulting/cordova-plugin-simple-camera-preview",
-  "version": "2.0.21",
+  "version": "2.0.22",
   "description": "Cordova plugin that allows camera interaction from HTML code for showing camera preview below or on top of the HTML.",
   "keywords": [
     "cordova",

plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<plugin id="@spoonconsulting/cordova-plugin-simple-camera-preview" version="2.0.21" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="@spoonconsulting/cordova-plugin-simple-camera-preview" version="2.0.22" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
 
   <name>cordova-plugin-simple-camera-preview</name>
   <description>Cordova plugin that allows camera interaction from HTML code. Show camera preview popup on top of the HTML.</description>

src/ios/CameraRenderController.h

@@ -19,6 +19,8 @@
   CVOpenGLESTextureRef _lumaTexture;
 }
 
+-(void) deallocateRenderMemory;
+
 @property (nonatomic) CameraSessionManager *sessionManager;
 @property (nonatomic) CIContext *ciContext;
 @property (nonatomic) CIImage *latestFrame;

src/ios/CameraRenderController.m

@@ -56,17 +56,6 @@ - (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];
-    [self.view removeFromSuperview];
-    [EAGLContext setCurrentContext:nil];
-    self.context = nil;
-    [self deallocateRenderMemory];
-    self.ciContext = nil;
-}
-
 - (void) appplicationIsActive:(NSNotification *)notification {
     dispatch_async(self.sessionManager.sessionQueue, ^{
         if (!self.sessionManager.session.running){
@@ -77,10 +66,6 @@ - (void) appplicationIsActive:(NSNotification *)notification {
 }
 
 - (void) applicationEnteredForeground:(NSNotification *)notification {
-//    dispatch_async(self.sessionManager.sessionQueue, ^{
-//        NSLog(@"Stopping session");
-//        [self.sessionManager.session stopRunning];
-//    });
     [self.view removeFromSuperview];
     [EAGLContext setCurrentContext:nil];
     self.context = nil;
@@ -157,24 +142,6 @@ -(void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CMS
     }
 }
 
-- (void)viewDidDisappear:(BOOL)animated {
-    [super viewDidDisappear:animated];
-
-    [EAGLContext setCurrentContext:nil];
-    self.context = nil;
-    [self deallocateRenderMemory];
-    self.ciContext = nil;
-    CVBufferRelease(_pixelBuffer);
-    _pixelBuffer = nil;
-}
-
-- (void)dealloc {
-    [EAGLContext setCurrentContext:nil];
-    self.context = nil;
-    [self deallocateRenderMemory];
-    self.ciContext = nil;
-}
-
 - (BOOL)shouldAutorotate {
     return YES;
 }
@@ -200,6 +167,17 @@ -(void) deallocateRenderMemory {
         CFRelease(_videoTextureCache);
         _videoTextureCache = nil;
     }
+    if(_lumaTexture) {
+        CVOpenGLESTextureCacheFlush(_lumaTexture, 0);
+        CFRelease(_lumaTexture);
+        _lumaTexture = nil;
+    }
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillEnterForegroundNotification object:nil];
+    [self.view removeFromSuperview];
+    [EAGLContext setCurrentContext:nil];
+    self.context = nil;
+    self.ciContext = nil;
 }
 
 @end

src/ios/CameraSessionManager.m

@@ -284,6 +284,7 @@ - (void)deallocSession {
   if (self.sessionQueue) {
     self.sessionQueue = nil;
   }
+  self.device = nil;
 }
 
 @end

src/ios/SimpleCameraPreview.m

@@ -113,14 +113,14 @@ - (void) disable:(CDVInvokedUrlCommand*)command {
             for(AVCaptureOutput *output in self.sessionManager.session.outputs) {
                 [self.sessionManager.session removeOutput:output];
             }
+            self.sessionManager.delegate = nil;
             [self.sessionManager deallocSession];
             self.sessionManager = nil;
             dispatch_async(dispatch_get_main_queue(), ^{
                 [self.cameraRenderController willMoveToParentViewController:nil];
                 [self.cameraRenderController.view removeFromSuperview];
-                if(self.viewController.parentViewController != nil) {
-                    [self.cameraRenderController removeFromParentViewController];
-                }
+                [self.cameraRenderController removeFromParentViewController];
+                [self.cameraRenderController deallocateRenderMemory];
                 self.cameraRenderController = nil;
                 [self deallocateMemory];
                 [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
@@ -236,6 +236,7 @@ - (NSDictionary *)getGPSDictionaryForLocation {
     [gps setObject:[formatter stringFromDate:location.timestamp] forKey:(NSString *)kCGImagePropertyGPSTimeStamp];
     [formatter setDateFormat:@"yyyy:MM:dd"];
     [gps setObject:[formatter stringFromDate:location.timestamp] forKey:(NSString *)kCGImagePropertyGPSDateStamp];
+    formatter = nil;
 
     // Latitude
     CGFloat latitude = location.coordinate.latitude;