amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 04:31:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

mp4录制文件名添加索引号，防止一秒内生成多个同名文件导致覆盖 (#2542)

Browse Source 
实测发现 如果在点播推流时 如果切片大小设置比较小 一秒钟可能产生多个mp4切片
以前切片名称粒度最小为一秒 所以会存在文件覆盖问题
This commit is contained in:
夏楚 2023-06-10 14:56:23 +08:00 committed by GitHub
parent 64b8079ac1
commit d3f1c2fab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Record/MP4Recorder.cpp
View File

@ -41,16 +41,16 @@ MP4Recorder::~MP4Recorder() {
void MP4Recorder::createFile() { void MP4Recorder::createFile() {
closeFile(); closeFile();
auto date = getTimeStr("%Y-%m-%d"); auto date = getTimeStr("%Y-%m-%d");
auto time = getTimeStr("%H-%M-%S"); auto file_name = getTimeStr("%H-%M-%S") + "-" + std::to_string(_file_index++) + ".mp4";
auto full_path_tmp = _folder_path + date + "/." + time + ".mp4"; auto full_path = _folder_path + date + "/" + file_name;
auto full_path = _folder_path + date + "/" + time + ".mp4"; auto full_path_tmp = _folder_path + date + "/." + file_name;
/////record 业务逻辑////// /////record 业务逻辑//////
_info.start_time = ::time(NULL); _info.start_time = ::time(NULL);
_info.file_name = time + ".mp4"; _info.file_name = file_name;
_info.file_path = full_path; _info.file_path = full_path;
GET_CONFIG(string, appName, Record::kAppName); GET_CONFIG(string, appName, Record::kAppName);
_info.url = appName + "/" + _info.app + "/" + _info.stream + "/" + date + "/" + time + ".mp4"; _info.url = appName + "/" + _info.app + "/" + _info.stream + "/" + date + "/" + file_name;
try { try {
_muxer = std::make_shared<MP4Muxer>(); _muxer = std::make_shared<MP4Muxer>();

3
src/Record/MP4Recorder.h
View File

@ -57,13 +57,14 @@ private:
private: private:
bool _have_video = false; bool _have_video = false;
size_t _max_second; size_t _max_second;
uint64_t _last_dts = 0;
uint64_t _file_index = 0;
std::string _folder_path; std::string _folder_path;
std::string _full_path; std::string _full_path;
std::string _full_path_tmp; std::string _full_path_tmp;
RecordInfo _info; RecordInfo _info;
MP4Muxer::Ptr _muxer; MP4Muxer::Ptr _muxer;
std::list<Track::Ptr> _tracks; std::list<Track::Ptr> _tracks;
uint64_t _last_dts = 0;
}; };
#endif ///ENABLE_MP4 #endif ///ENABLE_MP4