Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
c36ce497
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,发现更多精彩内容 >>
提交
c36ce497
编写于
5月 05, 2014
作者:
P
Palana
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor cleanup in mac-avcapture
上级
1c54dac3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
20 deletion
+26
-20
plugins/mac-avcapture/av-capture.m
plugins/mac-avcapture/av-capture.m
+26
-20
未找到文件。
plugins/mac-avcapture/av-capture.m
浏览文件 @
c36ce497
...
...
@@ -42,6 +42,23 @@ struct av_capture {
struct
source_frame
frame
;
};
static
inline
void
update_frame_size
(
struct
source_frame
*
frame
,
uint32_t
width
,
uint32_t
height
)
{
if
(
width
!=
frame
->
width
)
{
blog
(
LOG_DEBUG
,
"Changed width from %d to %d"
,
frame
->
width
,
width
);
frame
->
width
=
width
;
frame
->
linesize
[
0
]
=
width
*
2
;
}
if
(
height
!=
frame
->
height
)
{
blog
(
LOG_DEBUG
,
"Changed height from %d to %d"
,
frame
->
height
,
height
);
frame
->
height
=
height
;
}
}
@implementation
OBSAVCaptureDelegate
-
(
void
)
captureOutput
:(
AVCaptureOutput
*
)
out
didDropSampleBuffer
:(
CMSampleBufferRef
)
sampleBuffer
...
...
@@ -65,37 +82,26 @@ struct av_capture {
struct
source_frame
*
frame
=
&
capture
->
frame
;
CMSampleTimingInfo
info
;
CMSampleBufferGetSampleTimingInfo
(
sampleBuffer
,
0
,
&
info
);
CVImageBufferRef
img
=
CMSampleBufferGetImageBuffer
(
sampleBuffer
);
CVPixelBufferLockBaseAddress
(
img
,
0
);
uint32_t
h
=
CVPixelBufferGetHeight
(
img
);
if
(
h
!=
frame
->
height
)
{
blog
(
LOG_DEBUG
,
"Changed height from %d to %d"
,
frame
->
height
,
h
);
frame
->
height
=
h
;
}
uint32_t
w
=
CVPixelBufferGetWidth
(
img
);
if
(
w
!=
frame
->
width
)
{
blog
(
LOG_DEBUG
,
"Changed width from %d to %d"
,
frame
->
width
,
w
);
frame
->
width
=
w
;
frame
->
linesize
[
0
]
=
w
*
2
;
}
uint8_t
*
addr
=
CVPixelBufferGetBaseAddress
(
img
);
update_frame_size
(
frame
,
CVPixelBufferGetWidth
(
img
),
CVPixelBufferGetHeight
(
img
));
CMSampleTimingInfo
info
;
CMSampleBufferGetSampleTimingInfo
(
sampleBuffer
,
0
,
&
info
);
AVCaptureInputPort
*
port
=
capture
->
device_input
.
ports
[
0
];
CMTime
host_pts
=
CMSyncConvertTime
(
info
.
presentationTimeStamp
,
port
.
clock
,
CMClockGetHostTimeClock
());
frame
->
data
[
0
]
=
addr
;
CVPixelBufferLockBaseAddress
(
img
,
kCVPixelBufferLock_ReadOnly
);
frame
->
timestamp
=
host_pts
.
value
;
frame
->
data
[
0
]
=
CVPixelBufferGetBaseAddress
(
img
);
obs_source_output_video
(
capture
->
source
,
frame
);
CVPixelBufferUnlockBaseAddress
(
img
,
0
);
CVPixelBufferUnlockBaseAddress
(
img
,
kCVPixelBufferLock_ReadOnly
);
}
@end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录