实现媒体源pause/speed接口:#1129

src/Http/HttpSession.cpp

@@ -269,6 +269,7 @@ bool HttpSession::checkLiveStreamFMP4(const function<void()> &cb){
         setSocketFlags();
         onWrite(std::make_shared<BufferString>(fmp4_src->getInitSegment()), true);
         weak_ptr<HttpSession> weak_self = dynamic_pointer_cast<HttpSession>(shared_from_this());
+        fmp4_src->pause(false);
         _fmp4_reader = fmp4_src->getRing()->attach(getPoller());
         _fmp4_reader->setDetachCB([weak_self]() {
             auto strong_self = weak_self.lock();
@@ -309,6 +310,7 @@ bool HttpSession::checkLiveStreamTS(const function<void()> &cb){
         //直播牺牲延时提升发送性能
         setSocketFlags();
         weak_ptr<HttpSession> weak_self = dynamic_pointer_cast<HttpSession>(shared_from_this());
+        ts_src->pause(false);
         _ts_reader = ts_src->getRing()->attach(getPoller());
         _ts_reader->setDetachCB([weak_self](){
             auto strong_self = weak_self.lock();

src/Record/MP4Reader.cpp

@@ -47,6 +47,12 @@ MP4Reader::MP4Reader(const string &strVhost,const string &strApp, const string &
 }
 
 bool MP4Reader::readSample() {
+    if (_paused) {
+        //确保暂停时，时间轴不走动
+        _seek_ticker.resetTime();
+        return true;
+    }
+
     bool keyFrame = false;
     bool eof = false;
     while (!eof) {
@@ -89,17 +95,50 @@ void MP4Reader::startReadMP4() {
 }
 
 uint32_t MP4Reader::getCurrentStamp() {
-    return (uint32_t)(_seek_to + _seek_ticker.elapsedTime());
+    return (uint32_t)(_seek_to + !_paused * _speed * _seek_ticker.elapsedTime());
 }
 
-void MP4Reader::setCurrentStamp(uint32_t ui32Stamp){
-    _seek_to = ui32Stamp;
+void MP4Reader::setCurrentStamp(uint32_t new_stamp){
+    auto old_stamp = getCurrentStamp();
+    _seek_to = new_stamp;
     _seek_ticker.resetTime();
-    _mediaMuxer->setTimeStamp(ui32Stamp);
+    if (old_stamp != new_stamp) {
+        //时间轴未拖动时不操作
+        _mediaMuxer->setTimeStamp(new_stamp);
+    }
 }
 
-bool MP4Reader::seekTo(MediaSource &sender,uint32_t ui32Stamp){
-    return seekTo(ui32Stamp);
+bool MP4Reader::seekTo(MediaSource &sender, uint32_t stamp) {
+    //拖动进度条后应该恢复播放
+    pause(sender, false);
+    TraceL << getOriginUrl(sender) << ",stamp:" << stamp;
+    return seekTo(stamp);
+}
+
+bool MP4Reader::pause(MediaSource &sender, bool pause) {
+    if (_paused == pause) {
+        return true;
+    }
+    //_seek_ticker重新计时，不管是暂停还是seek都不影响总的播放进度
+    setCurrentStamp(getCurrentStamp());
+    _paused = pause;
+    TraceL << getOriginUrl(sender) << ",pause:" << pause;
+    return true;
+}
+
+bool MP4Reader::speed(MediaSource &sender, float speed) {
+    if (speed < 0.1 && speed > 20) {
+        WarnL << "播放速度取值范围非法:" << speed;
+        return false;
+    }
+    //设置播放速度后应该恢复播放
+    pause(sender, false);
+    if (_speed == speed) {
+        return true;
+    }
+    _speed = speed;
+    TraceL << getOriginUrl(sender) << ",speed:" << speed;
+    return true;
 }
 
 bool MP4Reader::seekTo(uint32_t ui32Stamp) {

src/Record/MP4Reader.h

@@ -38,7 +38,10 @@ public:
 
 private:
     //MediaSourceEvent override
-    bool seekTo(MediaSource &sender,uint32_t ui32Stamp) override;
+    bool seekTo(MediaSource &sender,uint32_t stamp) override;
+    bool pause(MediaSource &sender, bool pause) override;
+    bool speed(MediaSource &sender, float speed) override;
+
     bool close(MediaSource &sender,bool force) override;
     int totalReaderCount(MediaSource &sender) override;
     MediaOriginType getOriginType(MediaSource &sender) const override;
@@ -51,6 +54,8 @@ private:
 
 private:
     bool _have_video = false;
+    bool _paused = false;
+    float _speed = 1.0;
     uint32_t _seek_to;
     string _file_path;
     recursive_mutex _mtx;

src/Rtmp/FlvMuxer.cpp

@@ -36,6 +36,7 @@ void FlvMuxer::start(const EventPoller::Ptr &poller, const RtmpMediaSource::Ptr
     onWriteFlvHeader(media);
 
     std::weak_ptr<FlvMuxer> weakSelf = getSharedPtr();
+    media->pause(false);
     _ring_reader = media->getRing()->attach(poller);
     _ring_reader->setDetachCB([weakSelf]() {
         auto strongSelf = weakSelf.lock();

src/Rtmp/RtmpPusher.cpp

@@ -204,6 +204,7 @@ inline void RtmpPusher::send_metaData(){
         sendRtmp(pkt->type_id, _stream_index, pkt, pkt->time_stamp, pkt->chunk_id);
     });
 
+    src->pause(false);
     _rtmp_reader = src->getRing()->attach(getPoller());
     weak_ptr<RtmpPusher> weak_self = dynamic_pointer_cast<RtmpPusher>(shared_from_this());
     _rtmp_reader->setReadCB([weak_self](const RtmpMediaSource::RingDataType &pkt) {

src/Rtmp/RtmpSession.cpp

@@ -268,6 +268,7 @@ void RtmpSession::sendPlayResponse(const string &err,const RtmpMediaSource::Ptr
 
     //音频同步于视频
     _stamp[0].syncTo(_stamp[1]);
+    src->pause(false);
     _ring_reader = src->getRing()->attach(getPoller());
     weak_ptr<RtmpSession> weakSelf = dynamic_pointer_cast<RtmpSession>(shared_from_this());
     _ring_reader->setReadCB([weakSelf](const RtmpMediaSource::RingDataType &pkt) {
@@ -275,9 +276,6 @@ void RtmpSession::sendPlayResponse(const string &err,const RtmpMediaSource::Ptr
         if (!strongSelf) {
             return;
         }
-        if(strongSelf->_paused){
-            return;
-        }
         size_t i = 0;
         auto size = pkt->size();
         strongSelf->setSendFlushFlag(false);
@@ -295,10 +293,8 @@ void RtmpSession::sendPlayResponse(const string &err,const RtmpMediaSource::Ptr
         }
         strongSelf->shutdown(SockException(Err_shutdown,"rtmp ring buffer detached"));
     });
+    src->pause(false);
     _player_src = src;
-    if (src->totalReaderCount() == 1) {
-        src->seekTo(0);
-    }
     //提高服务器发送性能
     setSocketFlags();
 }
@@ -411,8 +407,6 @@ void RtmpSession::onCmd_pause(AMFDecoder &dec) {
     sendReply("onStatus", nullptr, status);
     //streamBegin
     sendUserControl(paused ? CONTROL_STREAM_EOF : CONTROL_STREAM_BEGIN, STREAM_MEDIA);
-    _paused = paused;
-
     auto strongSrc = _player_src.lock();
     if (strongSrc) {
         strongSrc->pause(paused);

src/Rtmp/RtmpSession.h

@@ -87,7 +87,6 @@ private:
     void dumpMetadata(const AMFValue &metadata);
 
 private:
-    bool _paused = false;
     bool _set_meta_data = false;
     double _recv_req_id = 0;
     //消耗的总流量

src/Rtsp/RtpMultiCaster.cpp

@@ -132,6 +132,7 @@ RtpMultiCaster::RtpMultiCaster(SocketHelper &helper, const string &local_ip, con
         _udp_sock[i]->bindPeerAddr((struct sockaddr *) &peer);
     }
 
+    src->pause(false);
     _rtp_reader = src->getRing()->attach(helper.getPoller());
     _rtp_reader->setReadCB([this](const RtspMediaSource::RingDataType &pkt) {
         size_t i = 0;

src/Rtsp/Rtsp.h

@@ -334,7 +334,7 @@ private:
 */
 class TitleSdp : public Sdp{
 public:
-
+    using Ptr = std::shared_ptr<TitleSdp>;
     /**
      * 构造title类型sdp
      * @param dur_sec rtsp点播时长，0代表直播，单位秒
@@ -362,10 +362,12 @@ public:
             _printer << "a=range:npt=now-\r\n";
         } else {
             //点播
+            _dur_sec = dur_sec;
             _printer << "a=range:npt=0-" << dur_sec << "\r\n";
         }
         _printer << "a=control:*\r\n";
     }
+
     string getSdp() const override {
         return _printer;
     }
@@ -373,7 +375,13 @@ public:
     CodecId getCodecId() const override {
         return CodecInvalid;
     }
+
+    float getDuration() const {
+        return _dur_sec;
+    }
+
 private:
+    float _dur_sec = 0;
     _StrPrinter _printer;
 };
 

src/Rtsp/RtspMuxer.cpp

@@ -14,6 +14,7 @@
 namespace mediakit {
 
 void RtspMuxer::onRtp(RtpPacket::Ptr in, bool is_key) {
+    if (_live) {
         if (_rtp_stamp[in->type] != in->getHeader()->stamp) {
             //rtp时间戳变化才计算ntp，节省cpu资源
             int64_t stamp_ms = in->getStamp() * uint64_t(1000) / in->sample_rate;
@@ -26,6 +27,10 @@ void RtspMuxer::onRtp(RtpPacket::Ptr in, bool is_key) {
 
         //rtp拦截入口，此处统一赋值ntp
         in->ntp_stamp = _ntp_stamp[in->type];
+    } else {
+        //点播情况下设置ntp时间戳为rtp时间戳
+        in->ntp_stamp = in->getStamp() * uint64_t(1000) / in->sample_rate;
+    }
     _rtpRing->write(std::move(in), is_key);
 }
 
@@ -33,6 +38,7 @@ RtspMuxer::RtspMuxer(const TitleSdp::Ptr &title) {
     if (!title) {
         _sdp = std::make_shared<TitleSdp>()->getSdp();
     } else {
+        _live = title->getDuration() == 0;
         _sdp = title->getSdp();
     }
     _rtpRing = std::make_shared<RtpRing::RingType>();

src/Rtsp/RtspMuxer.h

@@ -81,6 +81,7 @@ private:
     void trySyncTrack();
 
 private:
+    bool _live = true;
     uint32_t _rtp_stamp[TrackMax]{0};
     uint64_t _ntp_stamp[TrackMax]{0};
     uint64_t _ntp_stamp_start;

src/Rtsp/RtspPusher.cpp

@@ -452,6 +452,7 @@ void RtspPusher::sendRecord() {
             throw std::runtime_error("the media source was released");
         }
 
+        src->pause(false);
         _rtsp_reader = src->getRing()->attach(getPoller());
         weak_ptr<RtspPusher> weak_self = dynamic_pointer_cast<RtspPusher>(shared_from_this());
         _rtsp_reader->setReadCB([weak_self](const RtspMediaSource::RingDataType &pkt) {

src/Rtsp/RtspSession.cpp

@@ -105,7 +105,7 @@ void RtspSession::onManager() {
         return;
     }
 
-    if (!_push_src && _rtp_type == Rtsp::RTP_UDP && _enable_send_rtp && _alive_ticker.elapsedTime() > keep_alive_sec * 4000) {
+    if (!_push_src && _rtp_type == Rtsp::RTP_UDP && _alive_ticker.elapsedTime() > keep_alive_sec * 4000) {
         //rtp over udp播放器超时
         shutdown(SockException(Err_timeout, "rtp over udp player timeout"));
     }
@@ -774,12 +774,12 @@ void RtspSession::handleReq_Play(const Parser &parser) {
     }
 
     bool useGOP = true;
-    float iStartTime = 0;
-    auto &strRange = parser["Range"];
     auto &strScale = parser["Scale"];
-
+    auto &strRange = parser["Range"];
+    StrCaseMap res_header;
     if (!strScale.empty()) {
         //这是设置播放速度
+        res_header.emplace("Scale", strScale);
         auto speed = atof(strScale.data());
         play_src->speed(speed);
         InfoP(this) << "rtsp set play speed:" << speed;
@@ -787,12 +787,12 @@ void RtspSession::handleReq_Play(const Parser &parser) {
 
     if (!strRange.empty()) {
         //这是seek操作
-        _enable_send_rtp = false;
+        res_header.emplace("Range", strRange);
         auto strStart = FindField(strRange.data(), "npt=", "-");
         if (strStart == "now") {
             strStart = "0";
         }
-        iStartTime = 1000 * (float) atof(strStart.data());
+        auto iStartTime = 1000 * (float) atof(strStart.data());
         useGOP = !play_src->seekTo((uint32_t) iStartTime);
         InfoP(this) << "rtsp seekTo(ms):" << iStartTime;
     }
@@ -814,13 +814,13 @@ void RtspSession::handleReq_Play(const Parser &parser) {
     }
 
     rtp_info.pop_back();
-    sendRtspResponse("200 OK",
-                     {"Range", StrPrinter << "npt=" << setiosflags(ios::fixed) << setprecision(2) << (useGOP ? play_src->getTimeStamp(TrackInvalid) / 1000.0 : iStartTime / 1000),
-                      "RTP-Info",rtp_info
-                     });
+
+    res_header.emplace("RTP-Info", rtp_info);
+    //已存在Range时不覆盖
+    res_header.emplace("Range", StrPrinter << "npt=" << setiosflags(ios::fixed) << setprecision(2) << play_src->getTimeStamp(TrackInvalid) / 1000.0);
+    sendRtspResponse("200 OK", res_header);
 
     //在回复rtsp信令后再恢复播放
-    _enable_send_rtp = true;
     play_src->pause(false);
 
     setSocketFlags();
@@ -840,9 +840,7 @@ void RtspSession::handleReq_Play(const Parser &parser) {
             if (!strongSelf) {
                 return;
             }
-            if (strongSelf->_enable_send_rtp) {
             strongSelf->sendRtpPacket(pack);
-            }
         });
     }
 }
@@ -854,8 +852,6 @@ void RtspSession::handleReq_Pause(const Parser &parser) {
     }
 
     sendRtspResponse("200 OK");
-    _enable_send_rtp = false;
-
     auto play_src = _play_src.lock();
     if (play_src) {
         play_src->pause(true);

src/Rtsp/RtspSession.h

@@ -165,8 +165,6 @@ private:
 private:
     //是否已经触发on_play事件
     bool _emit_on_play = false;
-    //是否开始发送rtp
-    bool _enable_send_rtp;
     //推流或拉流客户端采用的rtp传输方式
     Rtsp::eRtpType _rtp_type = Rtsp::RTP_Invalid;
     //收到的seq，回复时一致

webrtc/WebRtcTransport.cpp

@@ -499,6 +499,7 @@ void WebRtcTransportImp::onStartWebRTC() {
             }
         }
 
+        _play_src->pause(false);
         _reader = _play_src->getRing()->attach(getPoller(), true);
         weak_ptr<WebRtcTransportImp> weak_self = static_pointer_cast<WebRtcTransportImp>(shared_from_this());
         _reader->setReadCB([weak_self](const RtspMediaSource::RingDataType &pkt) {