mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7044 from wolever:master

Browse Source
This commit is contained in:
Alexander Alekhin 2016-08-09 12:59:38 +00:00
commit 44bda8fbb7
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/videoio/src/cap_ios_abstract_camera.mm
View File

@ -193,16 +193,19 @@
// Release any retained subviews of the main view. // Release any retained subviews of the main view.
// e.g. self.myOutlet = nil; // e.g. self.myOutlet = nil;
for (AVCaptureInput *input in self.captureSession.inputs) { if (self.captureSession) {
[self.captureSession removeInput:input]; for (AVCaptureInput *input in self.captureSession.inputs) {
[self.captureSession removeInput:input];
}
for (AVCaptureOutput *output in self.captureSession.outputs) {
[self.captureSession removeOutput:output];
}
[self.captureSession stopRunning];
self.captureSession = nil;
} }
for (AVCaptureOutput *output in self.captureSession.outputs) {
[self.captureSession removeOutput:output];
}
[self.captureSession stopRunning];
self.captureSession = nil;
self.captureVideoPreviewLayer = nil; self.captureVideoPreviewLayer = nil;
self.videoCaptureConnection = nil; self.videoCaptureConnection = nil;
captureSessionLoaded = NO; captureSessionLoaded = NO;

25
modules/videoio/src/cap_ios_video_camera.mm
View File

@ -122,10 +122,6 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
- (void)stop; - (void)stop;
{ {
if (self.running == NO) {
return;
}
[super stop]; [super stop];
self.videoDataOutput = nil; self.videoDataOutput = nil;
@ -134,21 +130,24 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
} }
if (self.recordVideo == YES) { if (self.recordVideo == YES) {
if (self.recordAssetWriter) {
if (self.recordAssetWriter.status == AVAssetWriterStatusWriting) { if (self.recordAssetWriter.status == AVAssetWriterStatusWriting) {
[self.recordAssetWriter finishWriting]; [self.recordAssetWriter finishWriting];
NSLog(@"[Camera] recording stopped"); NSLog(@"[Camera] recording stopped");
} else { } else {
NSLog(@"[Camera] Recording Error: asset writer status is not writing"); NSLog(@"[Camera] Recording Error: asset writer status is not writing");
}
self.recordAssetWriter = nil;
} }
self.recordAssetWriter = nil;
self.recordAssetWriterInput = nil; self.recordAssetWriterInput = nil;
self.recordPixelBufferAdaptor = nil; self.recordPixelBufferAdaptor = nil;
} }
[self.customPreviewLayer removeFromSuperlayer]; if (self.customPreviewLayer) {
self.customPreviewLayer = nil; [self.customPreviewLayer removeFromSuperlayer];
self.customPreviewLayer = nil;
}
} }
// TODO fix // TODO fix