Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-03 08:57:32 +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

3
src/Common/MediaSource.cpp
View File

@@ -219,8 +219,9 @@ static MediaSource::Ptr find_l(const string &schema, const string &vhost_in, con
});
}
if(!ret && create_new){
if(!ret && create_new && schema != HLS_SCHEMA){
//未查找媒体源，则创建一个
//播放hls不触发mp4点播(因为HLS也可以用于录像，不是纯粹的直播)
ret = MediaSource::createFromMP4(schema, vhost, app, id);
}
return ret;

34
src/Common/MultiMediaSourceMuxer.cpp
View File

@@ -109,6 +109,25 @@ bool MultiMuxerPrivate::setupRecord(MediaSource &sender, Recorder::type type, bo
}
return true;
}
case Recorder::type_hls_record : {
if (start && !_hls_record) {
//开始录制
auto hls_record = dynamic_pointer_cast<HlsRecorder>(makeRecorder(getTracks(true), type, custom_path, sender));
if (hls_record) {
//设置HlsMediaSource的事件监听器
InfoL << "find record hls ms ";
hls_record->setListener(_listener);
//hls_src->setTrackSource(shared_from_this());
}
_hls_record = hls_record;
} else if (!start && _hls_record) {
//停止录制
InfoL << "stop record hls";
_hls_record = nullptr;
}
return true;
}
default : return false;
}
}
@@ -120,6 +139,8 @@ bool MultiMuxerPrivate::isRecording(MediaSource &sender, Recorder::type type){
return _hls ? true : false;
case Recorder::type_mp4 :
return _mp4 ? true : false;
case Recorder::type_hls_record :
return _hls_record ? true : false;
default:
return false;
}
@@ -155,6 +176,11 @@ void MultiMuxerPrivate::onTrackReady(const Track::Ptr &track) {
if (mp4) {
mp4->addTrack(track);
}
auto rhls = _hls_record;
if (rhls) {
rhls->addTrack(track);
}
}
bool MultiMuxerPrivate::isEnabled(){
@@ -181,6 +207,11 @@ void MultiMuxerPrivate::onTrackFrame(const Frame::Ptr &frame) {
if (mp4) {
mp4->inputFrame(frame);
}
auto rhls = _hls_record;
if (rhls) {
rhls->inputFrame(frame);
}
}
static string getTrackInfoStr(const TrackSource *track_src){
@@ -213,6 +244,7 @@ static string getTrackInfoStr(const TrackSource *track_src){
return codec_info;
}
void MultiMuxerPrivate::onAllTrackReady() {
if (_rtmp) {
_rtmp->onAllTrackReady();
@@ -404,4 +436,4 @@ bool MultiMediaSourceMuxer::isEnabled(){
}
}//namespace mediakit
}//namespace mediakit

1
src/Common/MultiMediaSourceMuxer.h
View File

@@ -56,6 +56,7 @@ private:
RtspMediaSourceMuxer::Ptr _rtsp;
HlsRecorder::Ptr _hls;
MediaSinkInterface::Ptr _mp4;
MediaSinkInterface::Ptr _hls_record;
std::weak_ptr<MediaSourceEvent> _listener;
};

2
src/Common/config.cpp
View File

@@ -52,6 +52,8 @@ const string kBroadcastShellLogin = "kBroadcastShellLogin";
const string kBroadcastNotFoundStream = "kBroadcastNotFoundStream";
const string kBroadcastStreamNoneReader = "kBroadcastStreamNoneReader";
const string kBroadcastHttpBeforeAccess = "kBroadcastHttpBeforeAccess";
const string kBroadcastRecordHls = "kBroadcastRecordHls";
const string kBroadcaseProxyPusherFailed = "kBroadcaseProxyPusherFailed";
} //namespace Broadcast
//通用配置项目

8
src/Common/config.h
View File

@@ -60,6 +60,14 @@ extern const string kBroadcastMediaChanged;
extern const string kBroadcastRecordMP4;
#define BroadcastRecordMP4Args const MP4Info &info
//录制hls文件成功后广播
extern const string kBroadcastRecordHls;
#define BroadcastRecordHlsArgs const HlsInfo &info
//转推流失败后广播
extern const string kBroadcaseProxyPusherFailed;
#define BroadcaseProxyPusherFailedArgs const ProxyPusherInfo &info
//收到http api请求广播
extern const string kBroadcastHttpRequest;
#define BroadcastHttpRequestArgs const Parser &parser,const HttpSession::HttpResponseInvoker &invoker,bool &consumed,SockInfo &sender

68
src/Record/HlsMaker.cpp
View File

@@ -9,18 +9,19 @@
*/
#include "HlsMaker.h"
using namespace toolkit;
namespace mediakit {
HlsMaker::HlsMaker(float seg_duration, uint32_t seg_number) {
HlsMaker::HlsMaker(float seg_duration, uint32_t seg_number, int record_type) {
//最小允许设置为0，0个切片代表点播
_seg_number = seg_number;
_seg_duration = seg_duration;
_hls_record_type = record_type;
}
HlsMaker::~HlsMaker() {
}
void HlsMaker::makeIndexFile(bool eof) {
char file_content[1024];
int maxSegmentDuration = 0;
@@ -32,32 +33,46 @@ void HlsMaker::makeIndexFile(bool eof) {
}
}
auto sequence = _seg_number ? (_file_index > _seg_number ? _file_index - _seg_number : 0LL) : 0LL;
auto sequence = _hls_record_type == 0 ? ( _seg_number ? (_file_index > _seg_number ? _file_index - _seg_number : 0LL) : 0LL): 0LL;
string m3u8;
snprintf(file_content, sizeof(file_content),
"#EXTM3U\n"
"#EXT-X-VERSION:3\n"
"#EXT-X-ALLOW-CACHE:NO\n"
"#EXT-X-TARGETDURATION:%u\n"
"#EXT-X-MEDIA-SEQUENCE:%llu\n",
(maxSegmentDuration + 999) / 1000,
sequence);
snprintf(file_content,sizeof(file_content),
"#EXTM3U\n"
"#EXT-X-VERSION:3\n"
"#EXT-X-ALLOW-CACHE:NO\n"
"#EXT-X-TARGETDURATION:%u\n"
"#EXT-X-MEDIA-SEQUENCE:%llu\n",
(maxSegmentDuration + 999) / 1000,
sequence);
m3u8.assign(file_content);
string rm3u8 = m3u8;
string rcontent;
for (auto &tp : _seg_dur_list) {
snprintf(file_content, sizeof(file_content), "#EXTINF:%.3f,\n%s\n", std::get<0>(tp) / 1000.0, std::get<1>(tp).data());
m3u8.append(file_content);
if (_hls_record_type == 2) {
auto &tp = _seg_dur_list.back();
snprintf(file_content,sizeof(file_content), "#EXTINF:%.3f,\n%s\n", std::get<0>(tp) / 1000.0, std::get<1>(tp).data());
rcontent.assign(file_content);
}else{
for (auto &tp : _seg_dur_list) {
snprintf(file_content,sizeof(file_content), "#EXTINF:%.3f,\n%s\n", std::get<0>(tp) / 1000.0, std::get<1>(tp).data());
m3u8.append(file_content);
}
}
if (eof) {
snprintf(file_content, sizeof(file_content), "#EXT-X-ENDLIST\n");
snprintf(file_content, sizeof(file_content),"#EXT-X-ENDLIST\n");
m3u8.append(file_content);
rcontent.append(file_content);
}
onWriteHls(m3u8.data(), m3u8.size());
}
if (_hls_record_type == 2) {
onWriteRecordM3u8(rm3u8.data(), rm3u8.size(), rcontent.data(), rcontent.size());
}else{
onWriteHls(m3u8.data(), m3u8.size());
}
}
void HlsMaker::inputData(void *data, uint32_t len, uint32_t timestamp, bool is_idr_fast_packet) {
if (data && len) {
@@ -68,16 +83,17 @@ void HlsMaker::inputData(void *data, uint32_t len, uint32_t timestamp, bool is_i
if (!_last_file_name.empty()) {
//存在切片才写入ts数据
onWriteSegment((char *) data, len);
_last_timestamp = timestamp;
}
} else {
//resetTracks时触发此逻辑
flushLastSegment(timestamp, true);
flushLastSegment(true);
}
}
void HlsMaker::delOldSegment() {
if (_seg_number == 0) {
//如果设置为保留0个切片，则认为是保存为点播
if(_seg_number == 0 || _hls_record_type == 2){
//如果设置为保留0个切片，则认为是保存为点播 ,record_type为2则是hls录制
return;
}
//在hls m3u8索引文件中,我们保存的切片个数跟_seg_number相关设置一致
@@ -99,31 +115,33 @@ void HlsMaker::addNewSegment(uint32_t stamp) {
}
//关闭并保存上一个切片，如果_seg_number==0,那么是点播。
flushLastSegment(stamp, _seg_number == 0);
flushLastSegment((_seg_number == 0 || _hls_record_type == 2));
//新增切片
_last_file_name = onOpenSegment(_file_index++);
//记录本次切片的起始时间戳
_last_seg_timestamp = stamp;
}
void HlsMaker::flushLastSegment(uint32_t timestamp, bool eof){
void HlsMaker::flushLastSegment(bool eof){
if (_last_file_name.empty()) {
//不存在上个切片
return;
}
//文件创建到最后一次数据写入的时间即为切片长度
auto seg_dur = timestamp - _last_seg_timestamp;
auto seg_dur = _last_timestamp - _last_seg_timestamp;
if (seg_dur <= 0) {
seg_dur = 100;
}
_seg_dur_list.push_back(std::make_tuple(seg_dur, _last_file_name));
_seg_dur_list.push_back(std::make_tuple(seg_dur, std::move(_last_file_name)));
delOldSegment();
makeIndexFile(eof);
_last_file_name.clear();
}
bool HlsMaker::isLive() {
return _seg_number != 0;
return _seg_number != 0 && _hls_record_type == 0;
}
void HlsMaker::clear() {

10
src/Record/HlsMaker.h
View File

@@ -28,7 +28,7 @@ public:
* @param seg_duration 切片文件长度
* @param seg_number 切片个数
*/
HlsMaker(float seg_duration = 5, uint32_t seg_number = 3);
HlsMaker(float seg_duration = 5, uint32_t seg_number = 3, int record_type = 0);
virtual ~HlsMaker();
/**
@@ -81,9 +81,11 @@ protected:
/**
* 关闭上个ts切片并且写入m3u8索引
* @param timestamp 毫秒时间戳
* @param eof
* @param eof HLS直播是否已结束
*/
void flushLastSegment(uint32_t timestamp, bool eof = false);
void flushLastSegment(bool eof = false);
virtual void onWriteRecordM3u8(const char *header, int hlen,const char *body,int blen) = 0;
private:
/**
@@ -106,10 +108,12 @@ private:
private:
float _seg_duration = 0;
uint32_t _seg_number = 0;
uint32_t _last_timestamp = 0;
uint32_t _last_seg_timestamp = 0;
uint64_t _file_index = 0;
string _last_file_name;
std::deque<tuple<int,string> > _seg_dur_list;
int32_t _hls_record_type;
};
}//namespace mediakit

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);
}

17
src/Record/HlsMakerImp.h
View File

@@ -20,14 +20,23 @@ using namespace std;
namespace mediakit {
class HlsInfo {
public:
string strFilePath;//m3u8文件路径
string strAppName;//应用名称
string strStreamId;//流ID
time_t ui64StartedTime; //GMT标准时间，单位秒
time_t ui64TimeLen;//录像长度，单位秒
};
class HlsMakerImp : public HlsMaker{
public:
HlsMakerImp(const string &m3u8_file,
const string &params,
uint32_t bufSize = 64 * 1024,
float seg_duration = 5,
uint32_t seg_number = 3);
uint32_t seg_number = 3,
int record_type = 0);
~HlsMakerImp() override;
/**
@@ -54,10 +63,11 @@ protected:
void onDelSegment(int index) override;
void onWriteSegment(const char *data, int len) override;
void onWriteHls(const char *data, int len) override;
void onWriteRecordM3u8(const char *header, int hlen, const char *body, int blen) override;
private:
std::shared_ptr<FILE> makeFile(const string &file,bool setbuf = false);
std::shared_ptr<FILE> makeRecordM3u8(const string &file,const string &mode,bool setbuf = false);
private:
int _buf_size;
string _params;
@@ -67,6 +77,7 @@ private:
std::shared_ptr<char> _file_buf;
HlsMediaSource::Ptr _media_src;
map<int /*index*/,string/*file_path*/> _segment_file_paths;
time_t _ui64StartedTime;
};
}//namespace mediakit

12
src/Record/HlsRecorder.h
View File

@@ -18,12 +18,12 @@ namespace mediakit {
class HlsRecorder : public MediaSourceEventInterceptor, public TsMuxer, public std::enable_shared_from_this<HlsRecorder> {
public:
typedef std::shared_ptr<HlsRecorder> Ptr;
HlsRecorder(const string &m3u8_file, const string &params){
GET_CONFIG(uint32_t, hlsNum, Hls::kSegmentNum);
GET_CONFIG(uint32_t, hlsBufSize, Hls::kFileBufSize);
GET_CONFIG(uint32_t, hlsDuration, Hls::kSegmentDuration);
_hls = std::make_shared<HlsMakerImp>(m3u8_file, params, hlsBufSize, hlsDuration, hlsNum);
//清空上次的残余文件
HlsRecorder(const string &m3u8_file, const string &params,int record_type){
GET_CONFIG(uint32_t,hlsNum,Hls::kSegmentNum);
GET_CONFIG(uint32_t,hlsBufSize,Hls::kFileBufSize);
GET_CONFIG(uint32_t,hlsDuration,Hls::kSegmentDuration);
_hls = std::make_shared<HlsMakerImp>(m3u8_file,params,hlsBufSize,hlsDuration,hlsNum,record_type);
//清空上次的残余文件
_hls->clearCache();
}

31
src/Record/Recorder.cpp
View File

@@ -13,6 +13,7 @@
#include "Common/MediaSource.h"
#include "MP4Recorder.h"
#include "HlsRecorder.h"
#include "Util/logger.h"
using namespace toolkit;
@@ -50,6 +51,22 @@ string Recorder::getRecordPath(Recorder::type type, const string &vhost, const s
}
return File::absolutePath(mp4FilePath, recordPath);
}
case Recorder::type_hls_record: {
GET_CONFIG(string, hlsPath, Record::kFilePath);
string m3u8FilePath;
if (enableVhost) {
m3u8FilePath = vhost + "/" + app + "/" + stream_id + "/hls.m3u8";
} else {
m3u8FilePath = app + "/" + stream_id + "/hls.m3u8";
}
//Here we use the customized file path.
if (!customized_path.empty()) {
m3u8FilePath = customized_path + "/hls.m3u8";
}
return File::absolutePath(m3u8FilePath, hlsPath);
}
default:
return "";
}
@@ -57,10 +74,12 @@ string Recorder::getRecordPath(Recorder::type type, const string &vhost, const s
std::shared_ptr<MediaSinkInterface> Recorder::createRecorder(type type, const string &vhost, const string &app, const string &stream_id, const string &customized_path){
auto path = Recorder::getRecordPath(type, vhost, app, stream_id, customized_path);
InfoL << "createRecorder type " << type << " path " << path;
switch (type) {
case Recorder::type_hls: {
#if defined(ENABLE_HLS)
auto ret = std::make_shared<HlsRecorder>(path, string(VHOST_KEY) + "=" + vhost);
auto ret = std::make_shared<HlsRecorder>(path, string(VHOST_KEY) + "=" + vhost, 0);
InfoL << "create Hls Record ret "<<ret;
ret->setMediaSource(vhost, app, stream_id);
return ret;
#endif
@@ -74,6 +93,16 @@ std::shared_ptr<MediaSinkInterface> Recorder::createRecorder(type type, const st
return nullptr;
}
case Recorder::type_hls_record: {
#if defined(ENABLE_HLS)
auto ret = std::make_shared<HlsRecorder>(path, string(VHOST_KEY) + "=" + vhost, 2);
InfoL << "create Hls Record ret "<<ret;
ret->setMediaSource(vhost, app, stream_id);
return ret;
#endif
return nullptr;
}
default:
return nullptr;
}

4
src/Record/Recorder.h
View File

@@ -22,7 +22,9 @@ public:
// 录制hls
type_hls = 0,
// 录制MP4
type_mp4 = 1
type_mp4 = 1,
type_hls_record = 2
} type;
/**