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
winlin
2017-02-09 14:29:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
99bffea328e8ad66a5cc3a7e53b91cd7ea555a5e
99bffea3
1 parent
15570d93
fix #503, disable utilities when reload a source. 2.0.233
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
33 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_source.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
99bffea
...
...
@@ -346,6 +346,7 @@ Remark:
## History
*
v2.0, 2017-02-09, fix
[
#503
][
bug #503
]
disable utilities when reload a source. 2.0.233
*
v2.0, 2017-01-22, for
[
#752
][
bug #752
]
release the io then free it for kbps. 2.0.232
*
v2.0, 2017-01-18, fix
[
#750
][
bug #750
]
use specific error code for dns resolve. 2.0.231
*
<strong>
v2.0, 2017-01-18,
[
2.0 beta4(2.0.230)
][
r2.0b4
]
released. 86334 lines.
</strong>
...
...
@@ -1285,6 +1286,7 @@ Winlin
[
bug #749
]:
https://github.com/ossrs/srs/issues/749
[
bug #750
]:
https://github.com/ossrs/srs/issues/750
[
bug #752
]:
https://github.com/ossrs/srs/issues/752
[
bug #503
]:
https://github.com/ossrs/srs/issues/503
[
bug #xxxxxxxxxx
]:
https://github.com/ossrs/srs/issues/xxxxxxxxxx
[
exo #828
]:
https://github.com/google/ExoPlayer/pull/828
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
99bffea
...
...
@@ -1227,6 +1227,12 @@ int SrsSource::on_reload_vhost_forward(string vhost)
// forwarders
destroy_forwarders
();
// Don't start forwarders when source is not active.
if
(
_can_publish
)
{
return
ret
;
}
if
((
ret
=
create_forwarders
())
!=
ERROR_SUCCESS
)
{
srs_error
(
"create forwarders failed. ret=%d"
,
ret
);
return
ret
;
...
...
@@ -1247,6 +1253,12 @@ int SrsSource::on_reload_vhost_hls(string vhost)
#ifdef SRS_AUTO_HLS
hls
->
on_unpublish
();
// Don't start forwarders when source is not active.
if
(
_can_publish
)
{
return
ret
;
}
if
((
ret
=
hls
->
on_publish
(
_req
,
true
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"hls publish failed. ret=%d"
,
ret
);
return
ret
;
...
...
@@ -1267,6 +1279,12 @@ int SrsSource::on_reload_vhost_hds(string vhost)
#ifdef SRS_AUTO_HDS
hds
->
on_unpublish
();
// Don't start forwarders when source is not active.
if
(
_can_publish
)
{
return
ret
;
}
if
((
ret
=
hds
->
on_publish
(
_req
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"hds publish failed. ret=%d"
,
ret
);
return
ret
;
...
...
@@ -1288,7 +1306,12 @@ int SrsSource::on_reload_vhost_dvr(string vhost)
#ifdef SRS_AUTO_DVR
// cleanup dvr
dvr
->
on_unpublish
();
// Don't start forwarders when source is not active.
if
(
_can_publish
)
{
return
ret
;
}
// reinitialize the dvr, update plan.
if
((
ret
=
dvr
->
initialize
(
this
,
_req
))
!=
ERROR_SUCCESS
)
{
return
ret
;
...
...
@@ -1316,6 +1339,12 @@ int SrsSource::on_reload_vhost_transcode(string vhost)
#ifdef SRS_AUTO_TRANSCODE
encoder
->
on_unpublish
();
// Don't start forwarders when source is not active.
if
(
_can_publish
)
{
return
ret
;
}
if
((
ret
=
encoder
->
on_publish
(
_req
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"start encoder failed. ret=%d"
,
ret
);
return
ret
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
99bffea
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 23
2
#define VERSION_REVISION 23
3
// generated by configure, only macros.
#include <srs_auto_headers.hpp>
...
...
请
注册
或
登录
后发表评论