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-07-16 17:30:27 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
366d3a3f560be157e7070f36a5bc604d1993c5b5
366d3a3f
1 parent
5f777240
for #441, use 30s timeout for first msg. 2.0.178
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
11 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/src/core/srs_core.hpp
trunk/src/kernel/srs_kernel_consts.hpp
README.md
查看文件 @
366d3a3
...
...
@@ -344,6 +344,7 @@ Remark:
### SRS 2.0 history
*
v2.0, 2015-07-16, for
[
#441
](
https://github.com/simple-rtmp-server/srs/issues/441
)
use 30s timeout for first msg. 2.0.178
*
v2.0, 2015-07-14, refine hls disable the time jitter, support not mix monotonically increase. 2.0.177
*
v2.0, 2015-07-01, fix
[
#433
](
https://github.com/simple-rtmp-server/srs/issues/433
)
fix the sps parse bug. 2.0.176
*
v2.0, 2015-06-10, fix
[
#425
](
https://github.com/simple-rtmp-server/srs/issues/425
)
refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175
...
...
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
366d3a3
...
...
@@ -782,8 +782,14 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd)
while
(
!
disposed
)
{
pprint
->
elapse
();
// cond wait for error.
// cond wait for timeout.
if
(
nb_msgs
==
0
)
{
// when not got msgs, wait for a larger timeout.
// @see https://github.com/simple-rtmp-server/srs/issues/441
trd
->
wait
(
SRS_CONSTS_RTMP_PUBLISHER_NO_MSG_RECV_TIMEOUT_US
/
1000
);
}
else
{
trd
->
wait
(
SRS_CONSTS_RTMP_PUBLISHER_RECV_TIMEOUT_US
/
1000
);
}
// check the thread error code.
if
((
ret
=
trd
->
error_code
())
!=
ERROR_SUCCESS
)
{
...
...
trunk/src/core/srs_core.hpp
查看文件 @
366d3a3
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 17
7
#define VERSION_REVISION 17
8
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/kernel/srs_kernel_consts.hpp
查看文件 @
366d3a3
...
...
@@ -78,6 +78,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// 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)
// when no msg recevied for publisher, use larger timeout.
#define SRS_CONSTS_RTMP_PUBLISHER_NO_MSG_RECV_TIMEOUT_US 10*SRS_CONSTS_RTMP_PUBLISHER_RECV_TIMEOUT_US
// the timeout to wait for client control message,
// if timeout, we generally ignore and send the data to client,
...
...
请
注册
或
登录
后发表评论