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
2014-12-04 21:39:42 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
09101b8d5e3e487c40f8c8f4c8a1a204cd040978
09101b8d
1 parent
279b4ff4
remove the increase timeout for read, for there is no small timeout.
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
0 行增加
和
20 行删除
trunk/src/rtmp/srs_protocol_stack.cpp
trunk/src/rtmp/srs_protocol_stack.cpp
查看文件 @
09101b8
...
...
@@ -1113,20 +1113,6 @@ int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg)
// the cid must not negative.
srs_assert
(
cid
>=
0
);
// once we got the chunk message header,
// that is there is a real message in cache,
// increase the timeout to got it.
// For example, in the play loop, we set timeout to 100ms,
// when we got a chunk header, we should increase the timeout,
// or we maybe timeout and disconnect the client.
int64_t
timeout_us
=
skt
->
get_recv_timeout
();
if
(
!
skt
->
is_never_timeout
(
timeout_us
))
{
int64_t
pkt_timeout_us
=
srs_max
(
timeout_us
,
SRS_MIN_RECV_TIMEOUT_US
);
skt
->
set_recv_timeout
(
pkt_timeout_us
);
srs_verbose
(
"change recv timeout_us "
"from %"
PRId64
" to %"
PRId64
""
,
timeout_us
,
pkt_timeout_us
);
}
// get the cached chunk stream.
SrsChunkStream
*
chunk
=
NULL
;
...
...
@@ -1177,12 +1163,6 @@ int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg)
return
ret
;
}
// reset the recv timeout
if
(
!
skt
->
is_never_timeout
(
timeout_us
))
{
skt
->
set_recv_timeout
(
timeout_us
);
srs_verbose
(
"reset recv timeout_us to %"
PRId64
""
,
timeout_us
);
}
// not got an entire RTMP message, try next chunk.
if
(
!
msg
)
{
srs_verbose
(
"get partial message success. chunk_payload_size=%d, size=%d, message(type=%d, size=%d, time=%"
PRId64
", sid=%d)"
,
...
...
请
注册
或
登录
后发表评论