Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-26 03:42:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

重置rtmp时间戳

Browse Source
This commit is contained in:
monktan
2020-11-03 21:26:48 +08:00
parent 4fb7e4841f
commit 2107e58295
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Rtmp/RtmpPusher.cpp
View File

@@ -20,6 +20,7 @@ namespace mediakit {
RtmpPusher::RtmpPusher(const EventPoller::Ptr &poller, const RtmpMediaSource::Ptr &src) : TcpClient(poller){
_publish_src = src;
_stamp[MSG_AUDIO % 2].syncTo(_stamp[MSG_VIDEO % 2]);
}
RtmpPusher::~RtmpPusher() {
@@ -199,7 +200,7 @@ inline void RtmpPusher::send_metaData(){
sendRequest(MSG_DATA, enc.data());
src->getConfigFrame([&](const RtmpPacket::Ptr &pkt) {
sendRtmp(pkt->type_id, _stream_index, pkt, pkt->time_stamp, pkt->chunk_id);
sendRtmp(pkt->type_id, _stream_index, pkt, 0, pkt->chunk_id);
});
_rtmp_reader = src->getRing()->attach(getPoller());
@@ -217,7 +218,9 @@ inline void RtmpPusher::send_metaData(){
if (++i == size) {
strong_self->setSendFlushFlag(true);
}
strong_self->sendRtmp(rtmp->type_id, strong_self->_stream_index, rtmp, rtmp->time_stamp, rtmp->chunk_id);
int64_t dts_out;
strong_self->_stamp[rtmp->type_id % 2].revise(rtmp->time_stamp, 0, dts_out, dts_out);
strong_self->sendRtmp(rtmp->type_id, strong_self->_stream_index, rtmp, dts_out & 0xFFFFFFFF, rtmp->chunk_id);
});
});
_rtmp_reader->setDetachCB([weak_self]() {

4
src/Rtmp/RtmpPusher.h
View File

@@ -15,6 +15,7 @@
#include "RtmpMediaSource.h"
#include "Network/TcpClient.h"
#include "Pusher/PusherBase.h"
#include "Common/Stamp.h"
namespace mediakit {
@@ -89,6 +90,9 @@ private:
std::shared_ptr<Timer> _publish_timer;
std::weak_ptr<RtmpMediaSource> _publish_src;
RtmpMediaSource::RingType::RingReader::Ptr _rtmp_reader;
//时间戳修改器
Stamp _stamp[2];
};
} /* namespace mediakit */