From 84784f21c423798d86485addfc6ed3ba3222eda7 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 24 Oct 2020 23:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Rtsp/RtpReceiver.cpp | 10 ++++------ src/Rtsp/RtpReceiver.h | 3 --- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Rtsp/RtpReceiver.cpp b/src/Rtsp/RtpReceiver.cpp index 8aee75d0..1509f1e0 100644 --- a/src/Rtsp/RtpReceiver.cpp +++ b/src/Rtsp/RtpReceiver.cpp @@ -124,13 +124,11 @@ bool RtpReceiver::handleOneRtp(int track_index, TrackType type, int samplerate, payload_ptr[3] = (rtp_raw_len & 0x00FF); //拷贝rtp负载 memcpy(payload_ptr + 4, rtp_raw_ptr, rtp_raw_len); - //排序rtp - sortRtp(std::move(rtp_ptr), track_index); - return true; -} -void RtpReceiver::sortRtp(const RtpPacket::Ptr &rtp,int track_index){ - _rtp_sortor[track_index].sortPacket(rtp->sequence, rtp); + //排序rtp + auto seq = rtp_ptr->sequence; + _rtp_sortor[track_index].sortPacket(seq, std::move(rtp_ptr)); + return true; } void RtpReceiver::clear() { diff --git a/src/Rtsp/RtpReceiver.h b/src/Rtsp/RtpReceiver.h index a7c2a2e8..14d6d991 100644 --- a/src/Rtsp/RtpReceiver.h +++ b/src/Rtsp/RtpReceiver.h @@ -187,9 +187,6 @@ protected: int getJitterSize(int track_index); int getCycleCount(int track_index); -private: - void sortRtp(const RtpPacket::Ptr &rtp , int track_index); - private: uint32_t _ssrc[2] = {0, 0}; //ssrc不匹配计数