aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-23 01:57:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !19 from Leon/master

Browse Source
This commit is contained in:
Leon 2022-07-19 08:16:27 +00:00 committed by Gitee
commit 4558ceae3e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Record/MP4Recorder.cpp
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved. * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
* *
* This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit). * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
@ -70,7 +70,7 @@ void MP4Recorder::asyncClose() {
auto info = _info; auto info = _info;
WorkThreadPool::Instance().getExecutor()->async([muxer, full_path_tmp, full_path, info]() mutable { WorkThreadPool::Instance().getExecutor()->async([muxer, full_path_tmp, full_path, info]() mutable {
//获取文件录制时间，放在关闭mp4之前是为了忽略关闭mp4执行时间 //获取文件录制时间，放在关闭mp4之前是为了忽略关闭mp4执行时间
info.time_len = (float) (::time(NULL) - info.start_time); //info.time_len = (float) (::time(NULL) - info.start_time);
//关闭mp4非常耗时，所以要放在后台线程执行 //关闭mp4非常耗时，所以要放在后台线程执行
muxer->closeMP4(); muxer->closeMP4();
@ -118,6 +118,12 @@ bool MP4Recorder::inputFrame(const Frame::Ptr &frame) {
} }
if (_muxer) { if (_muxer) {
if (_last_dts==0)
{
_last_dts = frame->dts();
}
auto duration = frame->dts() - _last_dts;
_info.time_len = int(duration/1000); //记录上一帧
//生成mp4文件 //生成mp4文件
return _muxer->inputFrame(frame); return _muxer->inputFrame(frame);
} }