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

新增hls追加录制，新增转推

Browse Source
This commit is contained in:
monktan
2020-09-17 20:59:33 +08:00
parent 00a7414f67
commit 01ec9d4b13
17 changed files with 561 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/Record/HlsMakerImp.cpp
View File

@@ -11,7 +11,6 @@
#include "HlsMakerImp.h"
#include "Util/util.h"
#include "Util/uv_errno.h"
using namespace toolkit;
namespace mediakit {
@@ -20,14 +19,15 @@ HlsMakerImp::HlsMakerImp(const string &m3u8_file,
const string &params,
uint32_t bufSize,
float seg_duration,
uint32_t seg_number) : HlsMaker(seg_duration, seg_number) {
uint32_t seg_number,int record_type) : HlsMaker(seg_duration, seg_number,record_type) {
_path_prefix = m3u8_file.substr(0, m3u8_file.rfind('/'));
_path_hls = m3u8_file;
_params = params;
_buf_size = bufSize;
_file_buf.reset(new char[bufSize], [](char *ptr) {
_file_buf.reset(new char[bufSize],[](char *ptr){
delete[] ptr;
});
_ui64StartedTime = ::time(nullptr);
}
HlsMakerImp::~HlsMakerImp() {
@@ -37,32 +37,44 @@ HlsMakerImp::~HlsMakerImp() {
void HlsMakerImp::clearCache() {
//录制完了
flushLastSegment(true);
if (isLive()) {
if(isLive()){
//hls直播才删除文件
clear();
_file = nullptr;
_segment_file_paths.clear();
File::delete_file(_path_prefix.data());
}else{
//hook接口
HlsInfo info;
if (_media_src) {
info.strAppName = _media_src.get()->getApp();
info.strStreamId = _media_src.get()->getId();
info.strFilePath = _path_hls;
info.ui64StartedTime = _ui64StartedTime;
info.ui64TimeLen = ::time(NULL) - info.ui64StartedTime;
}
NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastRecordHls, info);
}
}
string HlsMakerImp::onOpenSegment(int index) {
string segment_name, segment_path;
string segment_name , segment_path;
{
auto strDate = getTimeStr("%Y-%m-%d");
auto strHour = getTimeStr("%H");
auto strTime = getTimeStr("%M-%S");
segment_name = StrPrinter << strDate + "/" + strHour + "/" + strTime << "_" << index << ".ts";
segment_path = _path_prefix + "/" + segment_name;
if (isLive()) {
_segment_file_paths.emplace(index, segment_path);
segment_path = _path_prefix + "/" + segment_name;
if(isLive()){
_segment_file_paths.emplace(index,segment_path);
}
}
_file = makeFile(segment_path, true);
if (!_file) {
if(!_file){
WarnL << "create file failed," << segment_path << " " << get_uv_errmsg();
}
if (_params.empty()) {
if(_params.empty()){
return std::move(segment_name);
}
return std::move(segment_name + "?" + _params);
@@ -70,7 +82,7 @@ string HlsMakerImp::onOpenSegment(int index) {
void HlsMakerImp::onDelSegment(int index) {
auto it = _segment_file_paths.find(index);
if (it == _segment_file_paths.end()) {
if(it == _segment_file_paths.end()){
return;
}
File::delete_file(it->second.data());
@@ -85,32 +97,80 @@ void HlsMakerImp::onWriteSegment(const char *data, int len) {
void HlsMakerImp::onWriteHls(const char *data, int len) {
auto hls = makeFile(_path_hls);
if (hls) {
fwrite(data, len, 1, hls.get());
if(hls){
fwrite(data,len,1,hls.get());
hls.reset();
if (_media_src) {
if(_media_src){
_media_src->registHls(true);
}
} else {
} else{
WarnL << "create hls file failed," << _path_hls << " " << get_uv_errmsg();
}
//DebugL << "\r\n" << string(data,len);
}
std::shared_ptr<FILE> HlsMakerImp::makeFile(const string &file, bool setbuf) {
std::shared_ptr<FILE> HlsMakerImp::makeFile(const string &file,bool setbuf) {
auto file_buf = _file_buf;
auto ret = shared_ptr<FILE>(File::create_file(file.data(), "wb"), [file_buf](FILE *fp) {
auto ret= shared_ptr<FILE>(File::create_file(file.data(), "wb"), [file_buf](FILE *fp) {
if (fp) {
fclose(fp);
}
});
if (ret && setbuf) {
if(ret && setbuf){
setvbuf(ret.get(), _file_buf.get(), _IOFBF, _buf_size);
}
return ret;
}
void HlsMakerImp::onWriteRecordM3u8(const char *header, int hlen,const char *body,int blen){
bool exist = true;
string mode = "r+";
if (access(_path_hls.c_str(), 0) == -1) {
exist = false;
WarnL << "hls m3u8 not exist" << _path_hls;
mode = "w+";
}else{
WarnL << "hls m3u8 exist" << _path_hls;
}
auto hls = makeRecordM3u8(_path_hls, mode);
InfoL << "makeFile hls " << hls;
if(hls){
fwrite(header, hlen,1,hls.get());
if (exist) {
fseek(hls.get(),-15L,SEEK_END);
}
fwrite(body, blen,1,hls.get());
hls.reset();
if(_media_src){
_media_src->registHls(true);
}
} else{
WarnL << "create hls file falied," << _path_hls << " " << get_uv_errmsg();
}
DebugL << "\r\n" << string(body,blen);
DebugL << "_path_hls " << _path_hls;
}
std::shared_ptr<FILE> HlsMakerImp::makeRecordM3u8(const string &file,const string &mode,bool setbuf) {
auto file_buf = _file_buf;
auto ret= shared_ptr<FILE>(File::create_file(file.data(), mode.data()), [file_buf](FILE *fp) {
if (fp) {
fclose(fp);
}
});
if(ret && setbuf){
setvbuf(ret.get(), _file_buf.get(), _IOFBF, _buf_size);
}
return ret;
}
void HlsMakerImp::setMediaSource(const string &vhost, const string &app, const string &stream_id) {
_media_src = std::make_shared<HlsMediaSource>(vhost, app, stream_id);
}