diff --git a/src/Common/MultiMediaSourceMuxer.cpp b/src/Common/MultiMediaSourceMuxer.cpp index 5fb361c6..ddc8cd48 100644 --- a/src/Common/MultiMediaSourceMuxer.cpp +++ b/src/Common/MultiMediaSourceMuxer.cpp @@ -143,9 +143,7 @@ bool MultiMuxerPrivate::setupRecord(MediaSource &sender, Recorder::type type, bo auto hls_record = dynamic_pointer_cast(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) { diff --git a/src/Record/HlsMaker.cpp b/src/Record/HlsMaker.cpp index 3d5e0e70..18dd5f3b 100644 --- a/src/Record/HlsMaker.cpp +++ b/src/Record/HlsMaker.cpp @@ -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; diff --git a/src/Record/HlsMaker.h b/src/Record/HlsMaker.h index 63a69767..99b8f5b1 100644 --- a/src/Record/HlsMaker.h +++ b/src/Record/HlsMaker.h @@ -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 > _seg_dur_list; - int32_t _hls_record_type; + uint32_t _hls_record_type; }; }//namespace mediakit diff --git a/src/Record/HlsMakerImp.cpp b/src/Record/HlsMakerImp.cpp index 464ee643..778ed783 100644 --- a/src/Record/HlsMakerImp.cpp +++ b/src/Record/HlsMakerImp.cpp @@ -21,7 +21,8 @@ HlsMakerImp::HlsMakerImp(const string &m3u8_file, const string ¶ms, 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; diff --git a/src/Record/HlsMakerImp.h b/src/Record/HlsMakerImp.h index 6f94a81a..3450cd7e 100644 --- a/src/Record/HlsMakerImp.h +++ b/src/Record/HlsMakerImp.h @@ -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; /** diff --git a/src/Record/HlsRecorder.h b/src/Record/HlsRecorder.h index 40b5c22c..c1d01296 100644 --- a/src/Record/HlsRecorder.h +++ b/src/Record/HlsRecorder.h @@ -18,11 +18,11 @@ namespace mediakit { class HlsRecorder : public MediaSourceEventInterceptor, public TsMuxer, public std::enable_shared_from_this { public: typedef std::shared_ptr Ptr; - HlsRecorder(const string &m3u8_file, const string ¶ms,int record_type){ + HlsRecorder(const string &m3u8_file, const string ¶ms, 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(m3u8_file,params,hlsBufSize,hlsDuration,hlsNum,record_type); + _hls = std::make_shared(m3u8_file,params, hlsBufSize, hlsDuration, hlsNum, record_type); //清空上次的残余文件 _hls->clearCache(); }