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

添加按需转协议开关，默认一直转协议：#569

Browse Source
This commit is contained in:
xiongziliang
2020-11-15 00:40:46 +08:00
parent ebbe124d00
commit bb9b39d821
8 changed files with 67 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Common/config.cpp
View File

@@ -69,6 +69,11 @@ const string kPublishToHls = GENERAL_FIELD"publishToHls";
const string kPublishToMP4 = GENERAL_FIELD"publishToMP4";
const string kMergeWriteMS = GENERAL_FIELD"mergeWriteMS";
const string kModifyStamp = GENERAL_FIELD"modifyStamp";
const string kHlsDemand = GENERAL_FIELD"hls_demand";
const string kRtspDemand = GENERAL_FIELD"rtsp_demand";
const string kRtmpDemand = GENERAL_FIELD"rtmp_demand";
const string kTSDemand = GENERAL_FIELD"ts_demand";
const string kFMP4Demand = GENERAL_FIELD"fmp4_demand";
onceToken token([](){
mINI::Instance()[kFlowThreshold] = 1024;

6
src/Common/config.h
View File

@@ -181,6 +181,12 @@ extern const string kPublishToMP4 ;
extern const string kMergeWriteMS ;
//全局的时间戳覆盖开关，在转协议时，对frame进行时间戳覆盖
extern const string kModifyStamp;
//按需转协议的开关
extern const string kHlsDemand;
extern const string kRtspDemand;
extern const string kRtmpDemand;
extern const string kTSDemand;
extern const string kFMP4Demand;
}//namespace General

13
src/FMP4/FMP4MediaSourceMuxer.h
View File

@@ -41,26 +41,29 @@ public:
}
void onReaderChanged(MediaSource &sender, int size) override {
_enabled = size;
if (!size) {
GET_CONFIG(bool, fmp4_demand, General::kFMP4Demand);
_enabled = fmp4_demand ? size : true;
if (!size && fmp4_demand) {
_clear_cache = true;
}
MediaSourceEventInterceptor::onReaderChanged(sender, size);
}
void inputFrame(const Frame::Ptr &frame) override {
if (_clear_cache) {
GET_CONFIG(bool, fmp4_demand, General::kFMP4Demand);
if (_clear_cache && fmp4_demand) {
_clear_cache = false;
_media_src->clearCache();
}
if (_enabled) {
if (_enabled || !fmp4_demand) {
MP4MuxerMemory::inputFrame(frame);
}
}
bool isEnabled() {
GET_CONFIG(bool, fmp4_demand, General::kFMP4Demand);
//缓存尚未清空时，还允许触发inputFrame函数，以便及时清空缓存
return _clear_cache ? true : _enabled;
return fmp4_demand ? (_clear_cache ? true : _enabled) : true;
}
void onAllTrackReady() {

15
src/Record/HlsRecorder.h
View File

@@ -45,9 +45,10 @@ public:
}
void onReaderChanged(MediaSource &sender, int size) override {
GET_CONFIG(bool, hls_demand, General::kHlsDemand);
//hls保留切片个数为0时代表为hls录制(不删除切片)，那么不管有无观看者都一直生成hls
_enabled = _hls->isLive() ? size : true;
if (!size && _hls->isLive()) {
_enabled = hls_demand ? (_hls->isLive() ? size : true) : true;
if (!size && _hls->isLive() && hls_demand) {
//hls直播时，如果无人观看就删除视频缓存，目的是为了防止视频跳跃
_clear_cache = true;
}
@@ -55,16 +56,18 @@ public:
}
bool isEnabled() {
GET_CONFIG(bool, hls_demand, General::kHlsDemand);
//缓存尚未清空时，还允许触发inputFrame函数，以便及时清空缓存
return _clear_cache ? true : _enabled;
return hls_demand ? (_clear_cache ? true : _enabled) : true;
}
void inputFrame(const Frame::Ptr &frame) override{
if (_clear_cache) {
void inputFrame(const Frame::Ptr &frame) override {
GET_CONFIG(bool, hls_demand, General::kHlsDemand);
if (_clear_cache && hls_demand) {
_clear_cache = false;
_hls->clearCache();
}
if (_enabled) {
if (_enabled || !hls_demand) {
TsMuxer::inputFrame(frame);
}
}

13
src/Rtmp/RtmpMediaSourceMuxer.h
View File

@@ -50,26 +50,29 @@ public:
}
void onReaderChanged(MediaSource &sender, int size) override {
_enabled = size;
if (!size) {
GET_CONFIG(bool, rtmp_demand, General::kRtmpDemand);
_enabled = rtmp_demand ? size : true;
if (!size && rtmp_demand) {
_clear_cache = true;
}
MediaSourceEventInterceptor::onReaderChanged(sender, size);
}
void inputFrame(const Frame::Ptr &frame) override {
if (_clear_cache) {
GET_CONFIG(bool, rtmp_demand, General::kRtmpDemand);
if (_clear_cache && rtmp_demand) {
_clear_cache = false;
_media_src->clearCache();
}
if (_enabled) {
if (_enabled || !rtmp_demand) {
RtmpMuxer::inputFrame(frame);
}
}
bool isEnabled() {
GET_CONFIG(bool, rtmp_demand, General::kRtmpDemand);
//缓存尚未清空时，还允许触发inputFrame函数，以便及时清空缓存
return _clear_cache ? true : _enabled;
return rtmp_demand ? (_clear_cache ? true : _enabled) : true;
}
private:

13
src/Rtsp/RtspMediaSourceMuxer.h
View File

@@ -49,26 +49,29 @@ public:
}
void onReaderChanged(MediaSource &sender, int size) override {
_enabled = size;
if (!size) {
GET_CONFIG(bool, rtsp_demand, General::kRtspDemand);
_enabled = rtsp_demand ? size : true;
if (!size && rtsp_demand) {
_clear_cache = true;
}
MediaSourceEventInterceptor::onReaderChanged(sender, size);
}
void inputFrame(const Frame::Ptr &frame) override {
if (_clear_cache) {
GET_CONFIG(bool, rtsp_demand, General::kRtspDemand);
if (_clear_cache && rtsp_demand) {
_clear_cache = false;
_media_src->clearCache();
}
if (_enabled) {
if (_enabled || !rtsp_demand) {
RtspMuxer::inputFrame(frame);
}
}
bool isEnabled() {
GET_CONFIG(bool, rtsp_demand, General::kRtspDemand);
//缓存尚未清空时，还允许触发inputFrame函数，以便及时清空缓存
return _clear_cache ? true : _enabled;
return rtsp_demand ? (_clear_cache ? true : _enabled) : true;
}
private:

13
src/TS/TSMediaSourceMuxer.h
View File

@@ -40,26 +40,29 @@ public:
}
void onReaderChanged(MediaSource &sender, int size) override {
_enabled = size;
if (!size) {
GET_CONFIG(bool, ts_demand, General::kTSDemand);
_enabled = ts_demand ? size : true;
if (!size && ts_demand) {
_clear_cache = true;
}
MediaSourceEventInterceptor::onReaderChanged(sender, size);
}
void inputFrame(const Frame::Ptr &frame) override {
if (_clear_cache) {
GET_CONFIG(bool, ts_demand, General::kTSDemand);
if (_clear_cache && ts_demand) {
_clear_cache = false;
_media_src->clearCache();
}
if (_enabled) {
if (_enabled || !ts_demand) {
TsMuxer::inputFrame(frame);
}
}
bool isEnabled() {
GET_CONFIG(bool, ts_demand, General::kTSDemand);
//缓存尚未清空时，还允许触发inputFrame函数，以便及时清空缓存
return _clear_cache ? true : _enabled;
return ts_demand ? (_clear_cache ? true : _enabled) : true;
}
protected: