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 bug #241, support mr(merged-read) config and reload. 2.0.52.

Browse source
This commit is contained in:
winlin 2014-12-04 18:21:04 +08:00
parent 57f844b636
commit 5589b13d2e
18 changed files with 293 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -660,9 +660,8 @@ int SrsRtmpConn::fmle_publishing(SrsSource* source)
// use isolate thread to recv,
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/237
SrsPublishRecvThread trd(rtmp, st_netfd_fileno(stfd),
SRS_CONSTS_RTMP_RECV_TIMEOUT_US / 1000,
this, source, true, vhost_is_edge);
SrsPublishRecvThread trd(rtmp, req,
st_netfd_fileno(stfd), 0, this, source, true, vhost_is_edge);
srs_info("start to publish stream %s success", req->stream.c_str());
ret = do_publishing(source, &trd);
@ -696,9 +695,8 @@ int SrsRtmpConn::flash_publishing(SrsSource* source)
// use isolate thread to recv,
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/237
SrsPublishRecvThread trd(rtmp, st_netfd_fileno(stfd),
SRS_CONSTS_RTMP_RECV_TIMEOUT_US / 1000,
this, source, false, vhost_is_edge);
SrsPublishRecvThread trd(rtmp, req,
st_netfd_fileno(stfd), 0, this, source, true, vhost_is_edge);
srs_info("start to publish stream %s success", req->stream.c_str());
ret = do_publishing(source, &trd);