diff --git a/release/mac/Release/MediaServer b/release/mac/Release/MediaServer index 1d597237..a6c6cc71 100755 Binary files a/release/mac/Release/MediaServer and b/release/mac/Release/MediaServer differ diff --git a/release/mac/Release/libflv.a b/release/mac/Release/libflv.a index 6745be8a..7271c9a2 100644 Binary files a/release/mac/Release/libflv.a and b/release/mac/Release/libflv.a differ diff --git a/release/mac/Release/libjsoncpp.a b/release/mac/Release/libjsoncpp.a index c61a0fed..7ce43685 100644 Binary files a/release/mac/Release/libjsoncpp.a and b/release/mac/Release/libjsoncpp.a differ diff --git a/release/mac/Release/libmov.a b/release/mac/Release/libmov.a index 0cf0d1a8..7baaf5d2 100644 Binary files a/release/mac/Release/libmov.a and b/release/mac/Release/libmov.a differ diff --git a/release/mac/Release/libmpeg.a b/release/mac/Release/libmpeg.a index 0aaaf0e7..bf592422 100644 Binary files a/release/mac/Release/libmpeg.a and b/release/mac/Release/libmpeg.a differ diff --git a/release/mac/Release/libzlmediakit.a b/release/mac/Release/libzlmediakit.a index 38b47e58..95a8b4a7 100644 Binary files a/release/mac/Release/libzlmediakit.a and b/release/mac/Release/libzlmediakit.a differ diff --git a/release/mac/Release/libzltoolkit.a b/release/mac/Release/libzltoolkit.a index 3e9aa5a2..cd16d54d 100644 Binary files a/release/mac/Release/libzltoolkit.a and b/release/mac/Release/libzltoolkit.a differ diff --git a/release/mac/Release/test_benchmark b/release/mac/Release/test_benchmark index a5ccde1b..0d834e47 100755 Binary files a/release/mac/Release/test_benchmark and b/release/mac/Release/test_benchmark differ diff --git a/release/mac/Release/test_httpApi b/release/mac/Release/test_httpApi index 8f2c7751..6dfa9efd 100755 Binary files a/release/mac/Release/test_httpApi and b/release/mac/Release/test_httpApi differ diff --git a/release/mac/Release/test_player b/release/mac/Release/test_player index 62a6d5c3..d73ef2df 100755 Binary files a/release/mac/Release/test_player and b/release/mac/Release/test_player differ diff --git a/release/mac/Release/test_pusher b/release/mac/Release/test_pusher index e8b0ff74..2b2fa37a 100755 Binary files a/release/mac/Release/test_pusher and b/release/mac/Release/test_pusher differ diff --git a/release/mac/Release/test_pusherMp4 b/release/mac/Release/test_pusherMp4 index d3c0399a..153a9409 100755 Binary files a/release/mac/Release/test_pusherMp4 and b/release/mac/Release/test_pusherMp4 differ diff --git a/release/mac/Release/test_server b/release/mac/Release/test_server index 14345426..d173faf3 100755 Binary files a/release/mac/Release/test_server and b/release/mac/Release/test_server differ diff --git a/src/Rtsp/RtpReceiver.cpp b/src/Rtsp/RtpReceiver.cpp index adbf40bd..58c7e0a7 100644 --- a/src/Rtsp/RtpReceiver.cpp +++ b/src/Rtsp/RtpReceiver.cpp @@ -44,6 +44,9 @@ RtpReceiver::RtpReceiver() {} RtpReceiver::~RtpReceiver() {} bool RtpReceiver::handleOneRtp(int track_index,SdpTrack::Ptr &track, unsigned char *rtp_raw_ptr, unsigned int rtp_raw_len) { + if(rtp_raw_len < 12){ + return false; + } auto rtp_ptr = _rtp_pool.obtain(); auto &rtp = *rtp_ptr; auto length = rtp_raw_len + 4; @@ -109,9 +112,14 @@ bool RtpReceiver::handleOneRtp(int track_index,SdpTrack::Ptr &track, unsigned ch return false; } + uint8_t padding = 0; + if(rtp_raw_ptr[0] & 0x40){ + padding = rtp_raw_ptr[rtp_raw_len - 1]; + } + //设置rtp负载长度 rtp.setCapacity(length); - rtp.setSize(length); + rtp.setSize(length - padding); uint8_t *payload_ptr = (uint8_t *)rtp.data(); payload_ptr[0] = '$'; payload_ptr[1] = rtp.interleaved; diff --git a/src/Rtsp/Rtsp.h b/src/Rtsp/Rtsp.h index 883e68ce..e005c971 100644 --- a/src/Rtsp/Rtsp.h +++ b/src/Rtsp/Rtsp.h @@ -59,7 +59,7 @@ public: uint32_t timeStamp; uint16_t sequence; uint32_t ssrc; - uint8_t offset; + uint32_t offset; TrackType type; };