diff --git a/3rdpart/media-server b/3rdpart/media-server index d54285e9..66033ee4 160000 --- a/3rdpart/media-server +++ b/3rdpart/media-server @@ -1 +1 @@ -Subproject commit d54285e96260e6d56d68929ec9ace402b83ff6b0 +Subproject commit 66033ee4750a147a76ed5ff7785385e713d45926 diff --git a/src/Rtp/RtpProcess.cpp b/src/Rtp/RtpProcess.cpp index 17216b44..2764dfae 100644 --- a/src/Rtp/RtpProcess.cpp +++ b/src/Rtp/RtpProcess.cpp @@ -136,7 +136,7 @@ const char *RtpProcess::onSearchPacketTail(const char *packet,int bytes){ } return nullptr; } catch (std::exception &ex) { - InfoL << "解析ps或ts异常: bytes=" << bytes + InfoP(this) << "解析ps或ts异常: bytes=" << bytes << " ,exception=" << ex.what(); //<< " ,hex=" << hexdump((uint8_t *) packet, bytes); return nullptr; @@ -184,7 +184,7 @@ bool RtpProcess::alive() { if(_pause_rtp_time.elapsedTime()/ 1000 < 180){ return true; }else { - WarnL << _media_info._streamid << ", pause timeout."; + ErrorP(this) << "Pause timeout."; return false; } } diff --git a/tests/test_rtp_tcp.cpp b/tests/test_rtp_tcp.cpp index c81ff32f..3d09ebc3 100644 --- a/tests/test_rtp_tcp.cpp +++ b/tests/test_rtp_tcp.cpp @@ -8,6 +8,7 @@ * may be found in the AUTHORS file in the root of the source tree. */ +#include #include #include "Network/TcpClient.h" using namespace std;