Merge 6119ac9c53 into de7afaf992

Optimaztion for issue #3815 ffmpeg rtsp pull stream has negative pts

src/Rtp/GB28181Process.cpp

@@ -105,6 +105,16 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
                 _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
                 break;
             }
+            case Rtsp::PT_L16_Mono: {
+                //L16
+                ref = std::make_shared<RtpReceiverImp>(16000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); });
+                auto track = Factory::getTrackByCodecId(CodecL16, 16000, 1, 16);
+                CHECK(track);
+                track->setIndex(pt);
+                _interface->addTrack(track);
+                _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
+                break;
+            }
             default: {
                 if (pt == opus_pt) {
                     // opus负载  [AUTO-TRANSLATED:defa6a8d]

src/Rtsp/RtspMediaSourceImp.cpp

@@ -54,7 +54,9 @@ void RtspMediaSource::onWrite(RtpPacket::Ptr rtp, bool keyPos) {
     assert(rtp->type >= 0 && rtp->type < TrackMax);
     auto &track = _tracks[rtp->type];
     auto stamp = rtp->getStampMS();
-    if (track) {
+    bool is_video = rtp->type == TrackVideo;
+    // 音频总是更新，视频在关键包时更新
+    if (track && ((keyPos && _have_video && is_video) || (!is_video))) {
         track->_seq = rtp->getSeq();
         track->_time_stamp = rtp->getStamp() * uint64_t(1000) / rtp->sample_rate;
         track->_ssrc = rtp->getSSRC();
@@ -77,7 +79,7 @@ void RtspMediaSource::onWrite(RtpPacket::Ptr rtp, bool keyPos) {
             regist();
         }
     }
-    bool is_video = rtp->type == TrackVideo;
+   
     PacketCache<RtpPacket>::inputPacket(stamp, is_video, std::move(rtp), keyPos);
 }
 

src/Rtsp/RtspSession.cpp

@@ -833,7 +833,7 @@ void RtspSession::handleReq_Play(const Parser &parser) {
 
         rtp_info << "url=" << track->getControlUrl(_content_base) << ";"
                  << "seq=" << track->_seq << ";"
-                 << "rtptime=" << (int) (track->_time_stamp * (track->_samplerate / 1000)) << ",";
+                 << "rtptime=" << (int64_t)(track->_time_stamp) * (int64_t)(track->_samplerate/ 1000) << ",";
     }
 
     rtp_info.pop_back();