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

优化hls媒体流注册与无人观看清理机制 (#1421)

Browse Source 
* 优化hls媒体流注册与无人观看清理机制

* 优化hls cookie管理

* bug fixed
This commit is contained in:
夏楚
2022-02-12 16:24:55 +08:00
committed by GitHub
parent 2fbd8de727
commit e37982adee
5 changed files with 62 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Record/HlsRecorder.h
View File

@@ -38,36 +38,28 @@ public:
void setListener(const std::weak_ptr<MediaSourceEvent> &listener) {
setDelegate(listener);
_hls->getMediaSource()->setListener(shared_from_this());
//先注册媒体流，后续可以按需生成
_hls->getMediaSource()->registHls("");
}
int readerCount() {
return _hls->getMediaSource()->readerCount();
}
int readerCount() { return _hls->getMediaSource()->readerCount(); }
void onReaderChanged(MediaSource &sender, int size) override {
GET_CONFIG(bool, hls_demand, General::kHlsDemand);
//hls保留切片个数为0时代表为hls录制(不删除切片)，那么不管有无观看者都一直生成hls
// hls保留切片个数为0时代表为hls录制(不删除切片)，那么不管有无观看者都一直生成hls
_enabled = hls_demand ? (_hls->isLive() ? size : true) : true;
if (!size && _hls->isLive() && hls_demand) {
//hls直播时，如果无人观看就删除视频缓存，目的是为了防止视频跳跃
// hls直播时，如果无人观看就删除视频缓存，目的是为了防止视频跳跃
_clear_cache = true;
}
MediaSourceEventInterceptor::onReaderChanged(sender, size);
}
bool isEnabled() {
GET_CONFIG(bool, hls_demand, General::kHlsDemand);
//缓存尚未清空时，还允许触发inputFrame函数，以便及时清空缓存
return hls_demand ? (_clear_cache ? true : _enabled) : true;
}
bool inputFrame(const Frame::Ptr &frame) override {
GET_CONFIG(bool, hls_demand, General::kHlsDemand);
if (_clear_cache && hls_demand) {
_clear_cache = false;
//清空旧的m3u8索引文件于ts切片
_hls->clearCache();
_hls->getMediaSource()->setIndexFile("");
}
if (_enabled || !hls_demand) {
return MpegMuxer::inputFrame(frame);
@@ -75,6 +67,12 @@ public:
return false;
}
bool isEnabled() {
GET_CONFIG(bool, hls_demand, General::kHlsDemand);
//缓存尚未清空时，还允许触发inputFrame函数，以便及时清空缓存
return hls_demand ? (_clear_cache ? true : _enabled) : true;
}
private:
void onWrite(std::shared_ptr<toolkit::Buffer> buffer, uint32_t timestamp, bool key_pos) override {
if (!buffer) {
@@ -85,8 +83,7 @@ private:
}
private:
//默认不生成hls文件，有播放器时再生成
bool _enabled = false;
bool _enabled = true;
bool _clear_cache = false;
std::shared_ptr<HlsMakerImp> _hls;
};