external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #319, refine config, collect the mr and publish timeout

Browse source
This commit is contained in:
winlin 2015-08-29 22:41:50 +08:00
parent bc100c2867
commit 738642073e
11 changed files with 197 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -294,7 +294,7 @@ int SrsRtmpConn::on_reload_vhost_realtime(string vhost)
return ret;
}
int SrsRtmpConn::on_reload_vhost_p1stpt(string vhost)
int SrsRtmpConn::on_reload_vhost_publish(string vhost)
{
int ret = ERROR_SUCCESS;
@ -308,20 +308,9 @@ int SrsRtmpConn::on_reload_vhost_p1stpt(string vhost)
publish_1stpkt_timeout = p1stpt;
}
return ret;
}
int SrsRtmpConn::on_reload_vhost_pnt(string vhost)
{
int ret = ERROR_SUCCESS;
if (req->vhost != vhost) {
return ret;
}
int pnt = _srs_config->get_publish_normal_timeout(req->vhost);
if (pnt != publish_normal_timeout) {
srs_trace("p1stpt changed %d=>%d", publish_normal_timeout, pnt);
srs_trace("pnt changed %d=>%d", publish_normal_timeout, pnt);
publish_normal_timeout = pnt;
}