Merge pull request #7571 from panxiaochun:CvVideoCamera_stop

modules/videoio/src/cap_ios_abstract_camera.mm

@@ -203,11 +203,11 @@
         }
 
         [self.captureSession stopRunning];
-        self.captureSession = nil;
+        [captureSession release];
     }
 
-    self.captureVideoPreviewLayer = nil;
-    self.videoCaptureConnection = nil;
+    [captureVideoPreviewLayer release];
+    [videoCaptureConnection release];
     captureSessionLoaded = NO;
 }
 

modules/videoio/src/cap_ios_video_camera.mm

@@ -129,31 +129,33 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
 
 - (void)stop;
 {
-    [super stop];
+    if (self.running == YES) {
+        [super stop];
 
-    self.videoDataOutput = nil;
-    if (videoDataOutputQueue) {
-        dispatch_release(videoDataOutputQueue);
-    }
+        [videoDataOutput release];
+        if (videoDataOutputQueue) {
+            dispatch_release(videoDataOutputQueue);
+        }
 
-    if (self.recordVideo == YES) {
-        if (self.recordAssetWriter) {
-            if (self.recordAssetWriter.status == AVAssetWriterStatusWriting) {
-                [self.recordAssetWriter finishWriting];
-                NSLog(@"[Camera] recording stopped");
-            } else {
-                NSLog(@"[Camera] Recording Error: asset writer status is not writing");
+        if (self.recordVideo == YES) {
+            if (self.recordAssetWriter) {
+                if (self.recordAssetWriter.status == AVAssetWriterStatusWriting) {
+                    [self.recordAssetWriter finishWriting];
+                    NSLog(@"[Camera] recording stopped");
+                } else {
+                    NSLog(@"[Camera] Recording Error: asset writer status is not writing");
+                }
+                [recordAssetWriter release];
             }
-            self.recordAssetWriter = nil;
-        }
 
-        self.recordAssetWriterInput = nil;
-        self.recordPixelBufferAdaptor = nil;
-    }
+            [recordAssetWriterInput release];
+            [recordPixelBufferAdaptor release];
+        }
 
-    if (self.customPreviewLayer) {
-        [self.customPreviewLayer removeFromSuperlayer];
-        self.customPreviewLayer = nil;
+        if (self.customPreviewLayer) {
+            [self.customPreviewLayer removeFromSuperlayer];
+            self.customPreviewLayer = nil;
+        }
     }
 }