From d0a73d0f97b1de0dd3d5ca9ba2a6fa78394f8d2c Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Fri, 26 Oct 2018 14:19:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/MultiMediaSourceMuxer.h | 4 ++-- src/MediaFile/MediaReader.cpp | 2 +- src/Rtsp/RtspMediaSource.h | 2 +- src/RtspMuxer/RtspMediaSourceMuxer.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Common/MultiMediaSourceMuxer.h b/src/Common/MultiMediaSourceMuxer.h index 83b08a7e..08b9ee79 100644 --- a/src/Common/MultiMediaSourceMuxer.h +++ b/src/Common/MultiMediaSourceMuxer.h @@ -79,8 +79,8 @@ public: return _rtsp->readerCount() + _rtmp->readerCount(); } - void updateTimeStamp(uint32_t stamp){ - _rtsp->updateTimeStamp(stamp); + void setTimeStamp(uint32_t stamp){ + _rtsp->setTimeStamp(stamp); } private: RtmpMediaSourceMuxer::Ptr _rtmp; diff --git a/src/MediaFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp index aae801e1..3200e5b5 100644 --- a/src/MediaFile/MediaReader.cpp +++ b/src/MediaFile/MediaReader.cpp @@ -306,7 +306,7 @@ void MediaReader::seek(int iSeekTime,bool bReStart){ setSeekTime(iSeekTime); } } - _pChn->updateTimeStamp(_iSeekTime); + _pChn->setTimeStamp(_iSeekTime); if(bReStart){ AsyncTaskThread::Instance().CancelTask(reinterpret_cast(this)); diff --git a/src/Rtsp/RtspMediaSource.h b/src/Rtsp/RtspMediaSource.h index 4ad785f1..4cdaf125 100644 --- a/src/Rtsp/RtspMediaSource.h +++ b/src/Rtsp/RtspMediaSource.h @@ -92,7 +92,7 @@ public: return track->_time_stamp; } - void updateTimeStamp(uint32_t uiStamp) { + void setTimeStamp(uint32_t uiStamp) { auto tracks = _sdpAttr.getAvailableTrack(); for (auto &track : tracks) { track->_time_stamp = uiStamp; diff --git a/src/RtspMuxer/RtspMediaSourceMuxer.h b/src/RtspMuxer/RtspMediaSourceMuxer.h index 7d5b56d6..cf2ba581 100644 --- a/src/RtspMuxer/RtspMediaSourceMuxer.h +++ b/src/RtspMuxer/RtspMediaSourceMuxer.h @@ -51,8 +51,8 @@ public: int readerCount() const{ return _mediaSouce->getRing()->readerCount(); } - void updateTimeStamp(uint32_t stamp){ - _mediaSouce->updateTimeStamp(stamp); + void setTimeStamp(uint32_t stamp){ + _mediaSouce->setTimeStamp(stamp); } private: void onInited() override {