amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 18:50:20 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

优化GOP相关逻辑

Browse Source
This commit is contained in:
xiongziliang 2020-01-20 16:22:25 +08:00
parent f453668683
commit f5187e8b0d
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit 3850c1adcc5d184c6da0dd263ac011388bb2ffee
Subproject commit 8eaecbd6dd8bed0bee6a61168255653127a20a43

5
src/Rtmp/RtmpMediaSource.h
View File

@ -46,6 +46,7 @@
#include "Thread/ThreadPool.h"
using namespace toolkit;
#define RTMP_GOP_SIZE 512
namespace mediakit {
/**
@ -70,7 +71,7 @@ public:
RtmpMediaSource(const string &vhost,
const string &app,
const string &stream_id,
int ring_size = 0) :
int ring_size = RTMP_GOP_SIZE) :
MediaSource(RTMP_SCHEMA, vhost, app, stream_id), _ring_size(ring_size) {
}
@ -146,7 +147,7 @@ public:
//rtmp包缓存最大允许512个，如果是纯视频(25fps)大概为20秒数据
//但是这个是GOP缓存的上限值，真实的GOP缓存大小等于两个I帧之间的包数的两倍
//而且每次遇到I帧，则会清空GOP缓存，所以真实的GOP缓存远小于此值
_ring = std::make_shared<RingType>(_ring_size,512,std::move(lam));
_ring = std::make_shared<RingType>(_ring_size,std::move(lam));
onReaderChanged(0);
if(_metadata){

2
src/Rtmp/RtmpMediaSourceImp.h
View File

@ -54,7 +54,7 @@ public:
* @param id 流id
* @param ringSize 环形缓存大小
*/
RtmpMediaSourceImp(const string &vhost, const string &app, const string &id, int ringSize = 0) : RtmpMediaSource(vhost, app, id, ringSize) {
RtmpMediaSourceImp(const string &vhost, const string &app, const string &id, int ringSize = RTMP_GOP_SIZE) : RtmpMediaSource(vhost, app, id, ringSize) {
_demuxer = std::make_shared<RtmpDemuxer>();
_demuxer->setTrackListener(this);
}

8
src/Rtsp/RtspMediaSource.h
View File

@ -35,17 +35,17 @@
#include "Common/config.h"
#include "Common/MediaSource.h"
#include "RtpCodec.h"
#include "Util/logger.h"
#include "Util/RingBuffer.h"
#include "Util/TimeTicker.h"
#include "Util/ResourcePool.h"
#include "Util/NoticeCenter.h"
#include "Thread/ThreadPool.h"
using namespace std;
using namespace toolkit;
#define RTP_GOP_SIZE 2048
namespace mediakit {
/**
@ -70,7 +70,7 @@ public:
RtspMediaSource(const string &vhost,
const string &app,
const string &stream_id,
int ring_size = 0) :
int ring_size = RTP_GOP_SIZE) :
MediaSource(RTSP_SCHEMA, vhost, app, stream_id), _ring_size(ring_size) {}
virtual ~RtspMediaSource() {}
@ -182,7 +182,7 @@ public:
//rtp包缓存最大允许2048个，大概最多3MB数据
//但是这个是GOP缓存的上限值，真实的GOP缓存大小等于两个I帧之间的包数的两倍
//而且每次遇到I帧，则会清空GOP缓存，所以真实的GOP缓存远小于此值
_ring = std::make_shared<RingType>(_ring_size,2048, std::move(lam));
_ring = std::make_shared<RingType>(_ring_size, std::move(lam));
onReaderChanged(0);
if (!_sdp.empty()) {
regist();

2
src/Rtsp/RtspMediaSourceImp.h
View File

@ -45,7 +45,7 @@ public:
* @param id 流id
* @param ringSize 环形缓存大小
*/
RtspMediaSourceImp(const string &vhost, const string &app, const string &id, int ringSize = 0) : RtspMediaSource(vhost, app, id,ringSize) {
RtspMediaSourceImp(const string &vhost, const string &app, const string &id, int ringSize = RTP_GOP_SIZE) : RtspMediaSource(vhost, app, id,ringSize) {
_demuxer = std::make_shared<RtspDemuxer>();
_demuxer->setTrackListener(this);
}

2
src/Rtsp/RtspPlayerImp.h
View File

@ -72,6 +72,8 @@ private:
}
void onRecvRTP(const RtpPacket::Ptr &rtp, const SdpTrack::Ptr &track) override {
if(_pRtspMediaSrc){
// rtsp直接代理是无法判断该rtp是否是I帧，所以GOP缓存基本是无效的
// 为了减少内存使用，那么我们设置为一直关键帧以便清空GOP缓存
_pRtspMediaSrc->onWrite(rtp,true);
}
_delegate->inputRtp(rtp);