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-05-16 13:31:59 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4b8d3fe05fdbb124c3aa4a80f36cc5a4267dc32d
4b8d3fe0
1 parent
47089f0e
refine log, add overflow log
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
5 行增加
和
2 行删除
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
4b8d3fe
...
...
@@ -298,8 +298,8 @@ int SrsRtmpConn::stream_service_cycle()
}
bool
enabled_cache
=
_srs_config
->
get_gop_cache
(
req
->
vhost
);
srs_trace
(
"source found, url=%s, enabled_cache=%d, edge=%d"
,
req
->
get_stream_url
().
c_str
(),
enabled_cache
,
vhost_is_edge
);
srs_trace
(
"source found, ip=%s, url=%s, enabled_cache=%d, edge=%d"
,
ip
,
req
->
get_stream_url
().
c_str
(),
enabled_cache
,
vhost_is_edge
);
source
->
set_cache
(
enabled_cache
);
switch
(
type
)
{
...
...
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
查看文件 @
4b8d3fe
...
...
@@ -1157,6 +1157,9 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz
// milliseconds.
// in a word, 31bits timestamp is ok.
// convert extended timestamp to 31bits.
if
(
chunk
->
header
.
timestamp
>
0x7fffffff
)
{
srs_warn
(
"RTMP 31bits timestamp overflow, time=%"
PRId64
,
chunk
->
header
.
timestamp
);
}
chunk
->
header
.
timestamp
&=
0x7fffffff
;
// valid message
...
...
请
注册
或
登录
后发表评论