Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
b42288c2
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b42288c2
编写于
8月 04, 2016
作者:
D
David Wolever
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleaner fix for crash on double-stop of CvVideoCamera
上级
3d19de2b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
20 deletion
+22
-20
modules/videoio/src/cap_ios_abstract_camera.mm
modules/videoio/src/cap_ios_abstract_camera.mm
+10
-7
modules/videoio/src/cap_ios_video_camera.mm
modules/videoio/src/cap_ios_video_camera.mm
+12
-13
未找到文件。
modules/videoio/src/cap_ios_abstract_camera.mm
浏览文件 @
b42288c2
...
...
@@ -193,16 +193,19 @@
// Release any retained subviews of the main view.
// e.g. self.myOutlet = nil;
for
(
AVCaptureInput
*
input
in
self
.
captureSession
.
inputs
)
{
[
self
.
captureSession
removeInput
:
input
];
}
if
(
self
.
captureSession
)
{
for
(
AVCaptureInput
*
input
in
self
.
captureSession
.
inputs
)
{
[
self
.
captureSession
removeInput
:
input
];
}
for
(
AVCaptureOutput
*
output
in
self
.
captureSession
.
outputs
)
{
[
self
.
captureSession
removeOutput
:
output
];
for
(
AVCaptureOutput
*
output
in
self
.
captureSession
.
outputs
)
{
[
self
.
captureSession
removeOutput
:
output
];
}
[
self
.
captureSession
stopRunning
];
self
.
captureSession
=
nil
;
}
[
self
.
captureSession
stopRunning
];
self
.
captureSession
=
nil
;
self
.
captureVideoPreviewLayer
=
nil
;
self
.
videoCaptureConnection
=
nil
;
captureSessionLoaded
=
NO
;
...
...
modules/videoio/src/cap_ios_video_camera.mm
浏览文件 @
b42288c2
...
...
@@ -122,10 +122,6 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
-
(
void
)
stop
;
{
if
(
self
.
running
==
NO
)
{
return
;
}
[
super
stop
];
self
.
videoDataOutput
=
nil
;
...
...
@@ -134,21 +130,24 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
}
if
(
self
.
recordVideo
==
YES
)
{
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
.
recordAssetWriter
)
{
if
(
self
.
recordAssetWriter
.
status
==
AVAssetWriterStatusWriting
)
{
[
self
.
recordAssetWriter
finishWriting
];
NSLog
(
@"[Camera] recording stopped"
);
}
else
{
NSLog
(
@"[Camera] Recording Error: asset writer status is not writing"
);
}
self
.
recordAssetWriter
=
nil
;
}
self
.
recordAssetWriter
=
nil
;
self
.
recordAssetWriterInput
=
nil
;
self
.
recordPixelBufferAdaptor
=
nil
;
}
[
self
.
customPreviewLayer
removeFromSuperlayer
];
self
.
customPreviewLayer
=
nil
;
if
(
self
.
customPreviewLayer
)
{
[
self
.
customPreviewLayer
removeFromSuperlayer
];
self
.
customPreviewLayer
=
nil
;
}
}
// TODO fix
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录