From 63a50104fadc56c9cf02e3e9e12b2081e3229a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com>
Date: Sat, 29 Jul 2023 23:04:26 +0800
Subject: [PATCH] =?UTF-8?q?rtp=20ntp=E6=97=B6=E9=97=B4=E6=88=B3=E9=87=87?=
 =?UTF-8?q?=E7=94=A8=E9=80=8F=E4=BC=A0=E6=96=B9=E5=BC=8F=20(#2719)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtsp/RtpCodec.cpp  | 2 +-
 src/Rtsp/RtspMuxer.cpp | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Rtsp/RtpCodec.cpp b/src/Rtsp/RtpCodec.cpp
index 21257bce..6d1d4a9c 100644
--- a/src/Rtsp/RtpCodec.cpp
+++ b/src/Rtsp/RtpCodec.cpp
@@ -39,7 +39,7 @@ RtpPacket::Ptr RtpInfo::makeRtp(TrackType type, const void* data, size_t len, bo
     ++_seq;
     header->stamp = htonl(uint64_t(stamp) * _sample_rate / 1000);
     header->ssrc = htonl(_ssrc);
-
+    rtp->ntp_stamp = stamp;
     //有效负载
     if (data) {
         memcpy(&ptr[RtpPacket::kRtpHeaderSize + RtpPacket::kRtpTcpHeaderSize], data, len);
diff --git a/src/Rtsp/RtspMuxer.cpp b/src/Rtsp/RtspMuxer.cpp
index 755b7f5a..6f5e4f8f 100644
--- a/src/Rtsp/RtspMuxer.cpp
+++ b/src/Rtsp/RtspMuxer.cpp
@@ -14,9 +14,12 @@
 using namespace std;
 using namespace toolkit;
 
+#define ENABLE_NTP_STAMP 0
+
 namespace mediakit {
 
 void RtspMuxer::onRtp(RtpPacket::Ptr in, bool is_key) {
+#if ENABLE_NTP_STAMP
     if (_live) {
         if (_rtp_stamp[in->type] != in->getHeader()->stamp) {
             //rtp时间戳变化才计算ntp，节省cpu资源
@@ -34,6 +37,7 @@ void RtspMuxer::onRtp(RtpPacket::Ptr in, bool is_key) {
         //点播情况下设置ntp时间戳为rtp时间戳加基准ntp时间戳
         in->ntp_stamp = _ntp_stamp_start + (in->getStamp() * uint64_t(1000) / in->sample_rate);
     }
+#endif
     _rtpRing->write(std::move(in), is_key);
 }
 
@@ -49,7 +53,10 @@ RtspMuxer::RtspMuxer(const TitleSdp::Ptr &title) {
     _rtpInterceptor->setDelegate(std::make_shared<RingDelegateHelper>([this](RtpPacket::Ptr in, bool is_key) {
         onRtp(std::move(in), is_key);
     }));
+
+#if ENABLE_NTP_STAMP
     _ntp_stamp_start = getCurrentMillisecond(true);
+#endif
 }
 
 bool RtspMuxer::addTrack(const Track::Ptr &track) {
@@ -75,10 +82,12 @@ bool RtspMuxer::addTrack(const Track::Ptr &track) {
 }
 
 void RtspMuxer::trySyncTrack() {
+#if ENABLE_NTP_STAMP
     if (_encoder[TrackAudio] && _encoder[TrackVideo]) {
         //音频时间戳同步于视频，因为音频时间戳被修改后不影响播放
         _stamp[TrackAudio].syncTo(_stamp[TrackVideo]);
     }
+#endif
 }
 
 bool RtspMuxer::inputFrame(const Frame::Ptr &frame) {