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
2015-06-06 21:42:01 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ec245339559045d9b796310a8c8d40bc8e18ed17
ec245339
1 parent
a6dd8fb3
use smaller value for publish timeout.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
5 行增加
和
1 行删除
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/src/kernel/srs_kernel_consts.hpp
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
ec24533
...
...
@@ -869,7 +869,7 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd)
pprint
->
elapse
();
// cond wait for error.
trd
->
wait
(
SRS_CONSTS_RTMP_RECV_TIMEOUT_US
/
1000
);
trd
->
wait
(
SRS_CONSTS_RTMP_
PUBLISHER_
RECV_TIMEOUT_US
/
1000
);
// check the thread error code.
if
((
ret
=
trd
->
error_code
())
!=
ERROR_SUCCESS
)
{
...
...
trunk/src/kernel/srs_kernel_consts.hpp
查看文件 @
ec24533
...
...
@@ -74,6 +74,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// the timeout to wait client data,
// if timeout, close the connection.
#define SRS_CONSTS_RTMP_RECV_TIMEOUT_US (int64_t)(30*1000*1000LL)
// the timeout for publish recv.
// we must use more smaller timeout, for the recv never know the status
// of underlayer socket.
#define SRS_CONSTS_RTMP_PUBLISHER_RECV_TIMEOUT_US (int64_t)(3*1000*1000LL)
// the timeout to wait for client control message,
// if timeout, we generally ignore and send the data to client,
...
...
请
注册
或
登录
后发表评论