diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index de6d6326e..a534f0ee1 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -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) { diff --git a/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp b/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp index cdd40f922..bdca122ab 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp +++ b/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp @@ -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