Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
f3c33c23
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f3c33c23
编写于
8月 14, 2015
作者:
P
Palana
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mac-avcapture: Improve logging (less LOG_ERRORs)
上级
5eb5453f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
7 deletion
+13
-7
plugins/mac-avcapture/av-capture.mm
plugins/mac-avcapture/av-capture.mm
+13
-7
未找到文件。
plugins/mac-avcapture/av-capture.mm
浏览文件 @
f3c33c23
...
...
@@ -438,7 +438,7 @@ static void capture_device(av_capture *capture, AVCaptureDevice *dev,
if
(
obs_data_get_bool
(
settings
,
"use_preset"
))
{
NSString
*
preset
=
get_string
(
settings
,
"preset"
);
if
(
!
[
dev
supportsAVCaptureSessionPreset
:
preset
])
{
AVLOG
(
LOG_
ERROR
,
"Preset %s not available"
,
AVLOG
(
LOG_
WARNING
,
"Preset %s not available"
,
preset_names
(
preset
).
UTF8String
);
preset
=
select_preset
(
dev
,
preset
);
}
...
...
@@ -472,12 +472,12 @@ static inline void handle_disconnect_capture(av_capture *capture,
return
;
if
(
!
capture
->
device
)
{
AVLOG
(
LOG_
ERROR
,
"Received disconnect for unused
device '%s'"
,
AVLOG
(
LOG_
INFO
,
"Received disconnect for inactive
device '%s'"
,
capture
->
uid
.
UTF8String
);
return
;
}
AVLOG
(
LOG_
ERROR
,
"Device with unique ID '%s' disconnected"
,
AVLOG
(
LOG_
WARNING
,
"Device with unique ID '%s' disconnected"
,
dev
.
uniqueID
.
UTF8String
);
remove_device
(
capture
);
...
...
@@ -554,9 +554,9 @@ static bool av_capture_init(av_capture *capture, obs_data_t *settings)
if
(
!
dev
)
{
if
(
capture
->
uid
.
length
<
1
)
AVLOG
(
LOG_
ERROR
,
"No device selected"
);
AVLOG
(
LOG_
INFO
,
"No device selected"
);
else
AVLOG
(
LOG_
ERROR
,
"Could not initialize device "
\
AVLOG
(
LOG_
WARNING
,
"Could not initialize device "
\
"with unique ID '%s'"
,
capture
->
uid
.
UTF8String
);
return
true
;
...
...
@@ -838,9 +838,14 @@ static void switch_device(av_capture *capture, NSString *uid,
capture
->
uid
=
uid
;
if
(
!
uid
.
length
)
{
AVLOG
(
LOG_INFO
,
"No device selected, stopping capture"
);
return
;
}
AVCaptureDevice
*
dev
=
[
AVCaptureDevice
deviceWithUniqueID
:
uid
];
if
(
!
dev
)
{
AVLOG
(
LOG_
ERROR
,
"Device with unique id '%s' not found"
,
AVLOG
(
LOG_
WARNING
,
"Device with unique id '%s' not found"
,
uid
.
UTF8String
);
return
;
}
...
...
@@ -859,7 +864,8 @@ static void av_capture_update(void *data, obs_data_t *settings)
NSString
*
preset
=
get_string
(
settings
,
"preset"
);
if
(
!
[
capture
->
device
supportsAVCaptureSessionPreset
:
preset
])
{
AVLOG
(
LOG_ERROR
,
"Preset %s not available"
,
preset
.
UTF8String
);
AVLOG
(
LOG_WARNING
,
"Preset %s not available"
,
preset
.
UTF8String
);
preset
=
select_preset
(
capture
->
device
,
preset
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录