Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
6a27da9b
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,发现更多精彩内容 >>
提交
6a27da9b
编写于
11月 18, 2015
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
obs-outputs: Use atomic load functions
上级
598ae383
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
9 deletion
+24
-9
plugins/obs-outputs/rtmp-stream.c
plugins/obs-outputs/rtmp-stream.c
+24
-9
未找到文件。
plugins/obs-outputs/rtmp-stream.c
浏览文件 @
6a27da9b
...
...
@@ -121,22 +121,37 @@ static inline bool stopping(struct rtmp_stream *stream)
return
os_event_try
(
stream
->
stop_event
)
!=
EAGAIN
;
}
static
inline
bool
connecting
(
struct
rtmp_stream
*
stream
)
{
return
os_atomic_load_bool
(
&
stream
->
connecting
);
}
static
inline
bool
active
(
struct
rtmp_stream
*
stream
)
{
return
os_atomic_load_bool
(
&
stream
->
active
);
}
static
inline
bool
disconnected
(
struct
rtmp_stream
*
stream
)
{
return
os_atomic_load_bool
(
&
stream
->
disconnected
);
}
static
void
*
rtmp_stream_actual_stop
(
void
*
data
);
static
void
rtmp_stream_destroy
(
void
*
data
)
{
struct
rtmp_stream
*
stream
=
data
;
if
(
stopping
(
stream
)
&&
!
stream
->
connecting
)
{
if
(
stopping
(
stream
)
&&
!
connecting
(
stream
)
)
{
pthread_join
(
stream
->
stop_thread
,
NULL
);
}
else
if
(
stream
->
connecting
||
stream
->
active
)
{
}
else
if
(
connecting
(
stream
)
||
active
(
stream
)
)
{
if
(
stream
->
connecting
)
pthread_join
(
stream
->
connect_thread
,
NULL
);
os_event_signal
(
stream
->
stop_event
);
if
(
stream
->
active
)
{
if
(
active
(
stream
)
)
{
os_sem_post
(
stream
->
send_sem
);
obs_output_end_data_capture
(
stream
->
output
);
}
...
...
@@ -187,7 +202,7 @@ static void *rtmp_stream_actual_stop(void *data)
struct
rtmp_stream
*
stream
=
data
;
void
*
ret
;
if
(
stream
->
active
)
if
(
active
(
stream
)
)
pthread_join
(
stream
->
send_thread
,
&
ret
);
os_event_reset
(
stream
->
stop_event
);
...
...
@@ -204,12 +219,12 @@ static void rtmp_stream_stop(void *data)
if
(
stopping
(
stream
))
return
;
if
(
stream
->
connecting
)
if
(
connecting
(
stream
)
)
pthread_join
(
stream
->
connect_thread
,
NULL
);
os_event_signal
(
stream
->
stop_event
);
if
(
stream
->
active
)
{
if
(
active
(
stream
)
)
{
os_sem_post
(
stream
->
send_sem
);
obs_output_end_data_capture
(
stream
->
output
);
}
...
...
@@ -372,10 +387,10 @@ static void *send_thread(void *data)
}
}
if
(
!
stream
->
disconnected
&&
!
send_remaining_packets
(
stream
))
if
(
!
disconnected
(
stream
)
&&
!
send_remaining_packets
(
stream
))
os_atomic_set_bool
(
&
stream
->
disconnected
,
true
);
if
(
stream
->
disconnected
)
{
if
(
disconnected
(
stream
)
)
{
info
(
"Disconnected from %s"
,
stream
->
path
.
array
);
free_packets
(
stream
);
}
else
{
...
...
@@ -808,7 +823,7 @@ static void rtmp_stream_data(void *data, struct encoder_packet *packet)
struct
encoder_packet
new_packet
;
bool
added_packet
;
if
(
stream
->
disconnected
)
if
(
disconnected
(
stream
)
)
return
;
if
(
packet
->
type
==
OBS_ENCODER_VIDEO
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录