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

remove redundant log

Browse Source
This commit is contained in:
monktan
2020-10-28 10:53:19 +08:00
parent 039ce00211
commit 67719899b7
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/MultiMediaSourceMuxer.cpp
View File

@@ -143,9 +143,7 @@ bool MultiMuxerPrivate::setupRecord(MediaSource &sender, Recorder::type type, bo
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) {

2
src/Record/HlsMaker.cpp
View File

@@ -12,7 +12,7 @@
using namespace toolkit;
namespace mediakit {
HlsMaker::HlsMaker(float seg_duration, uint32_t seg_number, int record_type) {
HlsMaker::HlsMaker(float seg_duration, uint32_t seg_number, uint32_t record_type) {
//最小允许设置为0，0个切片代表点播
_seg_number = seg_number;
_seg_duration = seg_duration;

4
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, int record_type = 0);
HlsMaker(float seg_duration = 5, uint32_t seg_number = 3, uint32_t record_type = 0);
virtual ~HlsMaker();
/**
@@ -119,7 +119,7 @@ private:
uint64_t _file_index = 0;
string _last_file_name;
std::deque<tuple<int,string> > _seg_dur_list;
int32_t _hls_record_type;
uint32_t _hls_record_type;
};
}//namespace mediakit

3
src/Record/HlsMakerImp.cpp
View File

@@ -21,7 +21,8 @@ HlsMakerImp::HlsMakerImp(const string &m3u8_file,
const string &params,
uint32_t bufSize,
float seg_duration,
uint32_t seg_number,int record_type) : HlsMaker(seg_duration, seg_number,record_type) {
uint32_t seg_number,
uint32_t record_type) : HlsMaker(seg_duration, seg_number, record_type) {
_path_prefix = m3u8_file.substr(0, m3u8_file.rfind('/'));
_path_hls = m3u8_file;
_params = params;

2
src/Record/HlsMakerImp.h
View File

@@ -37,7 +37,7 @@ public:
uint32_t bufSize = 64 * 1024,
float seg_duration = 5,
uint32_t seg_number = 3,
int record_type = 0);
uint32_t record_type = 0);
~HlsMakerImp() override;
/**

4
src/Record/HlsRecorder.h
View File

@@ -18,11 +18,11 @@ 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,int record_type){
HlsRecorder(const string &m3u8_file, const string &params, uint32_t 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 = std::make_shared<HlsMakerImp>(m3u8_file,params, hlsBufSize, hlsDuration, hlsNum, record_type);
//清空上次的残余文件
_hls->clearCache();
}