正在显示
2 个修改的文件
包含
5 行增加
和
2 行删除
@@ -298,8 +298,8 @@ int SrsRtmpConn::stream_service_cycle() | @@ -298,8 +298,8 @@ int SrsRtmpConn::stream_service_cycle() | ||
298 | } | 298 | } |
299 | 299 | ||
300 | bool enabled_cache = _srs_config->get_gop_cache(req->vhost); | 300 | bool enabled_cache = _srs_config->get_gop_cache(req->vhost); |
301 | - srs_trace("source found, url=%s, enabled_cache=%d, edge=%d", | ||
302 | - req->get_stream_url().c_str(), enabled_cache, vhost_is_edge); | 301 | + srs_trace("source found, ip=%s, url=%s, enabled_cache=%d, edge=%d", |
302 | + ip, req->get_stream_url().c_str(), enabled_cache, vhost_is_edge); | ||
303 | source->set_cache(enabled_cache); | 303 | source->set_cache(enabled_cache); |
304 | 304 | ||
305 | switch (type) { | 305 | switch (type) { |
@@ -1157,6 +1157,9 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz | @@ -1157,6 +1157,9 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz | ||
1157 | // milliseconds. | 1157 | // milliseconds. |
1158 | // in a word, 31bits timestamp is ok. | 1158 | // in a word, 31bits timestamp is ok. |
1159 | // convert extended timestamp to 31bits. | 1159 | // convert extended timestamp to 31bits. |
1160 | + if (chunk->header.timestamp > 0x7fffffff) { | ||
1161 | + srs_warn("RTMP 31bits timestamp overflow, time=%"PRId64, chunk->header.timestamp); | ||
1162 | + } | ||
1160 | chunk->header.timestamp &= 0x7fffffff; | 1163 | chunk->header.timestamp &= 0x7fffffff; |
1161 | 1164 | ||
1162 | // valid message | 1165 | // valid message |
-
请 注册 或 登录 后发表评论