Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
48df41b5
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,发现更多精彩内容 >>
未验证
提交
48df41b5
编写于
3月 06, 2017
作者:
R
Richard Stanway
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
obs-outputs: Improve shutdown behavior of new socket loop
上级
5d136b13
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
30 deletion
+40
-30
plugins/obs-outputs/rtmp-stream.c
plugins/obs-outputs/rtmp-stream.c
+36
-30
plugins/obs-outputs/rtmp-windows.c
plugins/obs-outputs/rtmp-windows.c
+4
-0
未找到文件。
plugins/obs-outputs/rtmp-stream.c
浏览文件 @
48df41b5
...
...
@@ -106,6 +106,13 @@ static void rtmp_stream_destroy(void *data)
#ifdef TEST_FRAMEDROPS
circlebuf_free
(
&
stream
->
droptest_info
);
#endif
os_event_destroy
(
stream
->
buffer_space_available_event
);
os_event_destroy
(
stream
->
buffer_has_data_event
);
os_event_destroy
(
stream
->
socket_available_event
);
os_event_destroy
(
stream
->
send_thread_signaled_exit
);
pthread_mutex_destroy
(
&
stream
->
write_buf_mutex
);
if
(
stream
->
write_buf
)
bfree
(
stream
->
write_buf
);
bfree
(
stream
);
...
...
@@ -126,6 +133,32 @@ static void *rtmp_stream_create(obs_data_t *settings, obs_output_t *output)
if
(
os_event_init
(
&
stream
->
stop_event
,
OS_EVENT_TYPE_MANUAL
)
!=
0
)
goto
fail
;
if
(
pthread_mutex_init
(
&
stream
->
write_buf_mutex
,
NULL
)
!=
0
)
{
warn
(
"Failed to initialize write buffer mutex"
);
goto
fail
;
}
if
(
os_event_init
(
&
stream
->
buffer_space_available_event
,
OS_EVENT_TYPE_AUTO
)
!=
0
)
{
warn
(
"Failed to initialize write buffer event"
);
goto
fail
;
}
if
(
os_event_init
(
&
stream
->
buffer_has_data_event
,
OS_EVENT_TYPE_AUTO
)
!=
0
)
{
warn
(
"Failed to initialize data buffer event"
);
goto
fail
;
}
if
(
os_event_init
(
&
stream
->
socket_available_event
,
OS_EVENT_TYPE_AUTO
)
!=
0
)
{
warn
(
"Failed to initialize socket buffer event"
);
goto
fail
;
}
if
(
os_event_init
(
&
stream
->
send_thread_signaled_exit
,
OS_EVENT_TYPE_MANUAL
)
!=
0
)
{
warn
(
"Failed to initialize socket exit event"
);
goto
fail
;
}
UNUSED_PARAMETER
(
settings
);
return
stream
;
...
...
@@ -391,6 +424,8 @@ static void *send_thread(void *data)
os_event_signal
(
stream
->
send_thread_signaled_exit
);
os_event_signal
(
stream
->
buffer_has_data_event
);
pthread_join
(
stream
->
socket_thread
,
NULL
);
stream
->
socket_thread_active
=
false
;
stream
->
rtmp
.
m_bCustomSend
=
false
;
}
RTMP_Close
(
&
stream
->
rtmp
);
...
...
@@ -543,31 +578,7 @@ static int init_send(struct rtmp_stream *stream)
return
OBS_OUTPUT_ERROR
;
}
if
(
pthread_mutex_init
(
&
stream
->
write_buf_mutex
,
NULL
)
!=
0
)
{
warn
(
"Failed to initialize write buffer mutex"
);
return
OBS_OUTPUT_ERROR
;
}
if
(
os_event_init
(
&
stream
->
buffer_space_available_event
,
OS_EVENT_TYPE_AUTO
)
!=
0
)
{
warn
(
"Failed to initialize write buffer event"
);
return
OBS_OUTPUT_ERROR
;
}
if
(
os_event_init
(
&
stream
->
buffer_has_data_event
,
OS_EVENT_TYPE_AUTO
)
!=
0
)
{
warn
(
"Failed to initialize data buffer event"
);
return
OBS_OUTPUT_ERROR
;
}
if
(
os_event_init
(
&
stream
->
socket_available_event
,
OS_EVENT_TYPE_AUTO
)
!=
0
)
{
warn
(
"Failed to initialize socket buffer event"
);
return
OBS_OUTPUT_ERROR
;
}
if
(
os_event_init
(
&
stream
->
send_thread_signaled_exit
,
OS_EVENT_TYPE_MANUAL
)
!=
0
)
{
warn
(
"Failed to initialize socket exit event"
);
return
OBS_OUTPUT_ERROR
;
}
os_event_reset
(
stream
->
send_thread_signaled_exit
);
info
(
"New socket loop enabled by user"
);
if
(
stream
->
low_latency_mode
)
...
...
@@ -778,11 +789,6 @@ static bool init_connect(struct rtmp_stream *stream)
pthread_join
(
stream
->
send_thread
,
NULL
);
}
if
(
stream
->
socket_thread_active
)
{
pthread_join
(
stream
->
socket_thread
,
NULL
);
stream
->
socket_thread_active
=
false
;
}
free_packets
(
stream
);
service
=
obs_output_get_service
(
stream
->
output
);
...
...
plugins/obs-outputs/rtmp-windows.c
浏览文件 @
48df41b5
...
...
@@ -335,6 +335,10 @@ static inline void socket_thread_windows_internal(struct rtmp_stream *stream)
exit_write_loop:
;
}
if
(
stream
->
rtmp
.
m_sb
.
sb_socket
!=
INVALID_SOCKET
)
WSAEventSelect
(
stream
->
rtmp
.
m_sb
.
sb_socket
,
stream
->
socket_available_event
,
0
);
blog
(
LOG_INFO
,
"socket_thread_windows: Normal exit"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录