Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
zhengfl
2015-07-08 11:47:34 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
120033e0a2eed7e699936f741722a8dc095f59cc
120033e0
1 parent
f39faa78
fix #437
edge模式,重新从源站拉流时,导致forwarders异常
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
9 行增加
和
6 行删除
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_edge.cpp
100644 → 100755
查看文件 @
120033e
...
...
@@ -94,6 +94,13 @@ int SrsEdgeIngester::initialize(SrsSource* source, SrsPlayEdge* edge, SrsRequest
int
SrsEdgeIngester
::
start
()
{
int
ret
=
ERROR_SUCCESS
;
if
((
ret
=
_source
->
on_publish
())
!=
ERROR_SUCCESS
)
{
srs_error
(
"edge pull stream then publish to edge failed. ret=%d"
,
ret
);
return
ret
;
}
return
pthread
->
start
();
}
...
...
@@ -114,7 +121,8 @@ void SrsEdgeIngester::stop()
int
SrsEdgeIngester
::
cycle
()
{
int
ret
=
ERROR_SUCCESS
;
_source
->
on_source_id_changed
(
_srs_context
->
get_id
());
std
::
string
ep_server
,
ep_port
;
if
((
ret
=
connect_server
(
ep_server
,
ep_port
))
!=
ERROR_SUCCESS
)
{
return
ret
;
...
...
@@ -144,11 +152,6 @@ int SrsEdgeIngester::cycle()
return
ret
;
}
if
((
ret
=
_source
->
on_publish
())
!=
ERROR_SUCCESS
)
{
srs_error
(
"edge pull stream then publish to edge failed. ret=%d"
,
ret
);
return
ret
;
}
if
((
ret
=
_edge
->
on_ingest_play
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
请
注册
或
登录
后发表评论