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

Merge branch 'master' into hls_record_disk

Browse Source
This commit is contained in:
monktan 2021-12-16 20:48:02 +08:00
commit 55362f7d29
6 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/FMP4/FMP4MediaSource.h
View File

@ -64,9 +64,7 @@ public:
*/ */
void setInitSegment(string str) { void setInitSegment(string str) {
_init_segment = std::move(str); _init_segment = std::move(str);
if (_ring) { createRing();
regist();
}
} }
/** /**

2
src/FMP4/FMP4MediaSourceMuxer.h
View File

@ -72,7 +72,7 @@ public:
} }
protected: protected:
void onSegmentData(const string &string, uint32_t stamp, bool key_frame) override { void onSegmentData(string string, uint32_t stamp, bool key_frame) override {
if (string.empty()) { if (string.empty()) {
return; return;
} }

58
src/Record/MP4Muxer.cpp
View File

@ -9,10 +9,12 @@
*/ */
#ifdef ENABLE_MP4 #ifdef ENABLE_MP4
#include "MP4Muxer.h" #include "MP4Muxer.h"
#include "Util/File.h" #include "Util/File.h"
#include "Extension/H264.h" #include "Extension/H264.h"
namespace mediakit{
namespace mediakit {
MP4Muxer::MP4Muxer() {} MP4Muxer::MP4Muxer() {}
@ -20,19 +22,19 @@ MP4Muxer::~MP4Muxer() {
closeMP4(); closeMP4();
} }
void MP4Muxer::openMP4(const string &file){ void MP4Muxer::openMP4(const string &file) {
closeMP4(); closeMP4();
_file_name = file; _file_name = file;
_mp4_file = std::make_shared<MP4FileDisk>(); _mp4_file = std::make_shared<MP4FileDisk>();
_mp4_file->openFile(_file_name.data(), "wb+"); _mp4_file->openFile(_file_name.data(), "wb+");
} }
MP4FileIO::Writer MP4Muxer::createWriter(){ MP4FileIO::Writer MP4Muxer::createWriter() {
GET_CONFIG(bool, mp4FastStart, Record::kFastStart); GET_CONFIG(bool, mp4FastStart, Record::kFastStart);
return _mp4_file->createWriter(mp4FastStart ? MOV_FLAG_FASTSTART : 0, false); return _mp4_file->createWriter(mp4FastStart ? MOV_FLAG_FASTSTART : 0, false);
} }
void MP4Muxer::closeMP4(){ void MP4Muxer::closeMP4() {
MP4MuxerInterface::resetTracks(); MP4MuxerInterface::resetTracks();
_mp4_file = nullptr; _mp4_file = nullptr;
} }
@ -44,15 +46,15 @@ void MP4Muxer::resetTracks() {
/////////////////////////////////////////// MP4MuxerInterface ///////////////////////////////////////////// /////////////////////////////////////////// MP4MuxerInterface /////////////////////////////////////////////
void MP4MuxerInterface::saveSegment(){ void MP4MuxerInterface::saveSegment() {
mp4_writer_save_segment(_mov_writter.get()); mp4_writer_save_segment(_mov_writter.get());
} }
void MP4MuxerInterface::initSegment(){ void MP4MuxerInterface::initSegment() {
mp4_writer_init_segment(_mov_writter.get()); mp4_writer_init_segment(_mov_writter.get());
} }
bool MP4MuxerInterface::haveVideo() const{ bool MP4MuxerInterface::haveVideo() const {
return _have_video; return _have_video;
} }
@ -66,7 +68,7 @@ void MP4MuxerInterface::resetTracks() {
bool MP4MuxerInterface::inputFrame(const Frame::Ptr &frame) { bool MP4MuxerInterface::inputFrame(const Frame::Ptr &frame) {
auto it = _codec_to_trackid.find(frame->getCodecId()); auto it = _codec_to_trackid.find(frame->getCodecId());
if(it == _codec_to_trackid.end()){ if (it == _codec_to_trackid.end()) {
//该Track不存在或初始化失败 //该Track不存在或初始化失败
return false; return false;
} }
@ -84,7 +86,6 @@ bool MP4MuxerInterface::inputFrame(const Frame::Ptr &frame) {
//mp4文件时间戳需要从0开始 //mp4文件时间戳需要从0开始
auto &track_info = it->second; auto &track_info = it->second;
int64_t dts_out, pts_out; int64_t dts_out, pts_out;
switch (frame->getCodecId()) { switch (frame->getCodecId()) {
case CodecH264: case CodecH264:
case CodecH265: { case CodecH265: {
@ -117,7 +118,7 @@ bool MP4MuxerInterface::inputFrame(const Frame::Ptr &frame) {
return true; return true;
} }
static uint8_t getObject(CodecId codecId){ static uint8_t getObject(CodecId codecId) {
switch (codecId){ switch (codecId){
case CodecG711A : return MOV_OBJECT_G711a; case CodecG711A : return MOV_OBJECT_G711a;
case CodecG711U : return MOV_OBJECT_G711u; case CodecG711U : return MOV_OBJECT_G711u;
@ -129,8 +130,8 @@ static uint8_t getObject(CodecId codecId){
} }
} }
void MP4MuxerInterface::stampSync(){ void MP4MuxerInterface::stampSync() {
if(_codec_to_trackid.size() < 2){ if (_codec_to_trackid.size() < 2) {
return; return;
} }
@ -143,7 +144,7 @@ void MP4MuxerInterface::stampSync(){
} }
} }
if(audio && video){ if (audio && video) {
//音频时间戳同步于视频，因为音频时间戳被修改后不影响播放 //音频时间戳同步于视频，因为音频时间戳被修改后不影响播放
audio->syncTo(*video); audio->syncTo(*video);
} }
@ -202,7 +203,7 @@ bool MP4MuxerInterface::addTrack(const Track::Ptr &track) {
audio_track->getAudioSampleRate(), audio_track->getAudioSampleRate(),
audio_track->getAacCfg().data(), audio_track->getAacCfg().data(),
audio_track->getAacCfg().size()); audio_track->getAacCfg().size());
if(track_id < 0){ if (track_id < 0) {
WarnL << "添加AAC Track失败:" << track_id; WarnL << "添加AAC Track失败:" << track_id;
return false; return false;
} }
@ -220,7 +221,7 @@ bool MP4MuxerInterface::addTrack(const Track::Ptr &track) {
struct mpeg4_avc_t avc = {0}; struct mpeg4_avc_t avc = {0};
string sps_pps = string("\x00\x00\x00\x01", 4) + h264_track->getSps() + string sps_pps = string("\x00\x00\x00\x01", 4) + h264_track->getSps() +
string("\x00\x00\x00\x01", 4) + h264_track->getPps(); string("\x00\x00\x00\x01", 4) + h264_track->getPps();
h264_annexbtomp4(&avc, sps_pps.data(), (int)sps_pps.size(), NULL, 0, NULL, NULL); h264_annexbtomp4(&avc, sps_pps.data(), (int) sps_pps.size(), NULL, 0, NULL, NULL);
uint8_t extra_data[1024]; uint8_t extra_data[1024];
int extra_data_size = mpeg4_avc_decoder_configuration_record_save(&avc, extra_data, sizeof(extra_data)); int extra_data_size = mpeg4_avc_decoder_configuration_record_save(&avc, extra_data, sizeof(extra_data));
@ -236,7 +237,7 @@ bool MP4MuxerInterface::addTrack(const Track::Ptr &track) {
extra_data, extra_data,
extra_data_size); extra_data_size);
if(track_id < 0){ if (track_id < 0) {
WarnL << "添加H264 Track失败:" << track_id; WarnL << "添加H264 Track失败:" << track_id;
return false; return false;
} }
@ -256,7 +257,7 @@ bool MP4MuxerInterface::addTrack(const Track::Ptr &track) {
string vps_sps_pps = string("\x00\x00\x00\x01", 4) + h265_track->getVps() + string vps_sps_pps = string("\x00\x00\x00\x01", 4) + h265_track->getVps() +
string("\x00\x00\x00\x01", 4) + h265_track->getSps() + string("\x00\x00\x00\x01", 4) + h265_track->getSps() +
string("\x00\x00\x00\x01", 4) + h265_track->getPps(); string("\x00\x00\x00\x01", 4) + h265_track->getPps();
h265_annexbtomp4(&hevc, vps_sps_pps.data(), (int)vps_sps_pps.size(), NULL, 0, NULL, NULL); h265_annexbtomp4(&hevc, vps_sps_pps.data(), (int) vps_sps_pps.size(), NULL, 0, NULL, NULL);
uint8_t extra_data[1024]; uint8_t extra_data[1024];
int extra_data_size = mpeg4_hevc_decoder_configuration_record_save(&hevc, extra_data, sizeof(extra_data)); int extra_data_size = mpeg4_hevc_decoder_configuration_record_save(&hevc, extra_data, sizeof(extra_data));
@ -271,7 +272,7 @@ bool MP4MuxerInterface::addTrack(const Track::Ptr &track) {
h265_track->getVideoHeight(), h265_track->getVideoHeight(),
extra_data, extra_data,
extra_data_size); extra_data_size);
if(track_id < 0){ if (track_id < 0) {
WarnL << "添加H265 Track失败:" << track_id; WarnL << "添加H265 Track失败:" << track_id;
return false; return false;
} }
@ -298,7 +299,7 @@ MP4FileIO::Writer MP4MuxerMemory::createWriter() {
return _memory_file->createWriter(MOV_FLAG_SEGMENT, true); return _memory_file->createWriter(MOV_FLAG_SEGMENT, true);
} }
const string &MP4MuxerMemory::getInitSegment(){ const string &MP4MuxerMemory::getInitSegment() {
if (_init_segment.empty()) { if (_init_segment.empty()) {
initSegment(); initSegment();
saveSegment(); saveSegment();
@ -307,35 +308,36 @@ const string &MP4MuxerMemory::getInitSegment(){
return _init_segment; return _init_segment;
} }
void MP4MuxerMemory::resetTracks(){ void MP4MuxerMemory::resetTracks() {
MP4MuxerInterface::resetTracks(); MP4MuxerInterface::resetTracks();
_memory_file = std::make_shared<MP4FileMemory>(); _memory_file = std::make_shared<MP4FileMemory>();
_init_segment.clear(); _init_segment.clear();
} }
bool MP4MuxerMemory::inputFrame(const Frame::Ptr &frame){ bool MP4MuxerMemory::inputFrame(const Frame::Ptr &frame) {
if (_init_segment.empty()) { if (_init_segment.empty()) {
//尚未生成init segment //尚未生成init segment
return false; return false;
} }
bool key_frame = frame->keyFrame(); bool key_frame = frame->keyFrame();
if (_ticker.elapsedTime() > 50 || key_frame) {
//遇到关键帧或者超过50ms则切片 //flush切片
_ticker.resetTime(); saveSegment();
//flush切片
saveSegment(); auto data = _memory_file->getAndClearMemory();
if (!data.empty()) {
//输出切片数据 //输出切片数据
onSegmentData(_memory_file->getAndClearMemory(), frame->dts(), _key_frame); onSegmentData(std::move(data), frame->dts(), _key_frame);
_key_frame = false; _key_frame = false;
} }
if (key_frame) { if (key_frame) {
_key_frame = true; _key_frame = true;
} }
return MP4MuxerInterface::inputFrame(frame); return MP4MuxerInterface::inputFrame(frame);
} }
}//namespace mediakit }//namespace mediakit
#endif//#ifdef ENABLE_MP4 #endif//#ifdef ENABLE_MP4

3
src/Record/MP4Muxer.h
View File

@ -134,14 +134,13 @@ protected:
* @param stamp 切片末尾时间戳 * @param stamp 切片末尾时间戳
* @param key_frame 是否有关键帧 * @param key_frame 是否有关键帧
*/ */
virtual void onSegmentData(const string &string, uint32_t stamp, bool key_frame) = 0; virtual void onSegmentData(string string, uint32_t stamp, bool key_frame) = 0;
protected: protected:
MP4FileIO::Writer createWriter() override; MP4FileIO::Writer createWriter() override;
private: private:
bool _key_frame = false; bool _key_frame = false;
Ticker _ticker;
string _init_segment; string _init_segment;
MP4FileMemory::Ptr _memory_file; MP4FileMemory::Ptr _memory_file;
}; };

7
src/Record/MP4Reader.cpp
View File

@ -59,17 +59,15 @@ bool MP4Reader::readSample() {
bool keyFrame = false; bool keyFrame = false;
bool eof = false; bool eof = false;
while (!eof) { while (!eof && _last_dts < getCurrentStamp()) {
auto frame = _demuxer->readFrame(keyFrame, eof); auto frame = _demuxer->readFrame(keyFrame, eof);
if (!frame) { if (!frame) {
continue; continue;
} }
_last_dts = frame->dts();
if (_muxer) { if (_muxer) {
_muxer->inputFrame(frame); _muxer->inputFrame(frame);
} }
if (frame->dts() > getCurrentStamp()) {
break;
}
} }
GET_CONFIG(bool, fileRepeat, Record::kFileRepeat); GET_CONFIG(bool, fileRepeat, Record::kFileRepeat);
@ -129,6 +127,7 @@ uint32_t MP4Reader::getCurrentStamp() {
void MP4Reader::setCurrentStamp(uint32_t new_stamp){ void MP4Reader::setCurrentStamp(uint32_t new_stamp){
auto old_stamp = getCurrentStamp(); auto old_stamp = getCurrentStamp();
_seek_to = new_stamp; _seek_to = new_stamp;
_last_dts = new_stamp;
_seek_ticker.resetTime(); _seek_ticker.resetTime();
if (old_stamp != new_stamp && _muxer) { if (old_stamp != new_stamp && _muxer) {
//时间轴未拖动时不操作 //时间轴未拖动时不操作

1
src/Record/MP4Reader.h
View File

@ -60,6 +60,7 @@ private:
bool _have_video = false; bool _have_video = false;
bool _paused = false; bool _paused = false;
float _speed = 1.0; float _speed = 1.0;
uint32_t _last_dts = 0;
uint32_t _seek_to; uint32_t _seek_to;
string _file_path; string _file_path;
recursive_mutex _mtx; recursive_mutex _mtx;