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, calc the small and sleep for merged read.

Browse source
This commit is contained in:
winlin 2014-12-03 22:39:25 +08:00
parent aee00877df
commit 850946bb13
9 changed files with 99 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -659,7 +659,7 @@ int SrsRtmpConn::fmle_publishing(SrsSource* source)
// use isolate thread to recv,
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/237
SrsPublishRecvThread trd(rtmp,
SrsPublishRecvThread trd(rtmp, st_netfd_fileno(stfd),
SRS_CONSTS_RTMP_RECV_TIMEOUT_US / 1000,
this, source, true, vhost_is_edge);
@ -695,7 +695,7 @@ int SrsRtmpConn::flash_publishing(SrsSource* source)
// use isolate thread to recv,
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/237
SrsPublishRecvThread trd(rtmp,
SrsPublishRecvThread trd(rtmp, st_netfd_fileno(stfd),
SRS_CONSTS_RTMP_RECV_TIMEOUT_US / 1000,
this, source, false, vhost_is_edge);