amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 20:27:34 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

优化代码结构

Browse Source
This commit is contained in:
xiongziliang 2019-04-09 12:39:38 +08:00
parent 3284ab2464
commit 1a3d1eb4fb
2 changed files with 81 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/Extension/H264.h
View File

@ -283,44 +283,16 @@ private:
case H264Frame::NAL_IDR:{ case H264Frame::NAL_IDR:{
//I //I
if(!_sps.empty() && _last_frame_type != H264Frame::NAL_IDR){ insertConfigFrame(frame);
if(!_spsFrame)
{
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
insertFrame->type = H264Frame::NAL_SPS;
insertFrame->timeStamp = frame->stamp();
insertFrame->buffer.assign("\x0\x0\x0\x1",4);
insertFrame->buffer.append(_sps);
insertFrame->iPrefixSize = 4;
_spsFrame = insertFrame;
}
_spsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_spsFrame);
}
if(!_pps.empty() && _last_frame_type != H264Frame::NAL_IDR){
if(!_ppsFrame)
{
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
insertFrame->type = H264Frame::NAL_PPS;
insertFrame->timeStamp = frame->stamp();
insertFrame->buffer.assign("\x0\x0\x0\x1",4);
insertFrame->buffer.append(_pps);
insertFrame->iPrefixSize = 4;
_ppsFrame = insertFrame;
}
_ppsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_ppsFrame);
}
VideoTrack::inputFrame(frame); VideoTrack::inputFrame(frame);
_last_frame_type = type; _last_frame_is_idr = true;
} }
break; break;
case H264Frame::NAL_B_P:{ case H264Frame::NAL_B_P:{
//B or P //B or P
VideoTrack::inputFrame(frame); VideoTrack::inputFrame(frame);
_last_frame_type = type; _last_frame_is_idr = false;
} }
break; break;
} }
@ -329,13 +301,45 @@ private:
onReady(); onReady();
} }
} }
private:
//在idr帧前插入sps pps帧
void insertConfigFrame(const Frame::Ptr &frame){
if(_last_frame_is_idr){
return;
}
if(!_sps.empty()){
if(!_spsFrame){
_spsFrame = std::make_shared<H264Frame>();
_spsFrame->type = H264Frame::NAL_SPS;
_spsFrame->buffer.assign("\x0\x0\x0\x1",4);
_spsFrame->buffer.append(_sps);
_spsFrame->iPrefixSize = 4;
}
_spsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_spsFrame);
}
if(!_pps.empty()){
if(!_ppsFrame) {
_ppsFrame = std::make_shared<H264Frame>();
_ppsFrame->type = H264Frame::NAL_PPS;
_ppsFrame->buffer.assign("\x0\x0\x0\x1",4);
_ppsFrame->buffer.append(_pps);
_ppsFrame->iPrefixSize = 4;
}
_ppsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_ppsFrame);
}
}
private: private:
string _sps; string _sps;
string _pps; string _pps;
int _width = 0; int _width = 0;
int _height = 0; int _height = 0;
float _fps = 0; float _fps = 0;
int _last_frame_type = -1; bool _last_frame_is_idr = false;
H264Frame::Ptr _spsFrame; H264Frame::Ptr _spsFrame;
H264Frame::Ptr _ppsFrame; H264Frame::Ptr _ppsFrame;
}; };

87
src/Extension/H265.h
View File

@ -215,51 +215,14 @@ public:
void inputFrame(const Frame::Ptr &frame) override { void inputFrame(const Frame::Ptr &frame) override {
int type = H265_TYPE(((uint8_t *) frame->data() + frame->prefixSize())[0]); int type = H265_TYPE(((uint8_t *) frame->data() + frame->prefixSize())[0]);
if (H265Frame::isKeyFrame(type)) { if (H265Frame::isKeyFrame(type)) {
//关键帧之前插入vps sps pps insertConfigFrame(frame);
if(!_vps.empty()){
if (!_vpsFrame) {
H265Frame::Ptr insertFrame = std::make_shared<H265Frame>();
insertFrame->type = H265Frame::NAL_VPS;
insertFrame->timeStamp = frame->stamp();
insertFrame->buffer.assign("\x0\x0\x0\x1", 4);
insertFrame->buffer.append(_sps);
insertFrame->iPrefixSize = 4;
_vpsFrame = insertFrame;
}
_vpsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_vpsFrame);
}
if (!_sps.empty()) {
if (!_spsFrame) {
H265Frame::Ptr insertFrame = std::make_shared<H265Frame>();
insertFrame->type = H265Frame::NAL_SPS;
insertFrame->timeStamp = frame->stamp();
insertFrame->buffer.assign("\x0\x0\x0\x1", 4);
insertFrame->buffer.append(_sps);
insertFrame->iPrefixSize = 4;
_spsFrame = insertFrame;
}
_spsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_spsFrame);
}
if (!_pps.empty()) {
if (!_ppsFrame) {
H265Frame::Ptr insertFrame = std::make_shared<H265Frame>();
insertFrame->type = H265Frame::NAL_PPS;
insertFrame->timeStamp = frame->stamp();
insertFrame->buffer.assign("\x0\x0\x0\x1", 4);
insertFrame->buffer.append(_pps);
insertFrame->iPrefixSize = 4;
_ppsFrame = insertFrame;
}
_ppsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_ppsFrame);
}
VideoTrack::inputFrame(frame); VideoTrack::inputFrame(frame);
_last_frame_is_idr = true;
return; return;
} }
_last_frame_is_idr = false;
//非idr帧 //非idr帧
switch (type) { switch (type) {
case H265Frame::NAL_VPS: { case H265Frame::NAL_VPS: {
@ -291,14 +254,54 @@ private:
return std::make_shared<std::remove_reference<decltype(*this)>::type>(*this); return std::make_shared<std::remove_reference<decltype(*this)>::type>(*this);
} }
//在idr帧前插入vps sps pps帧
void insertConfigFrame(const Frame::Ptr &frame){
if(_last_frame_is_idr){
return;
}
if(!_vps.empty()){
if (!_vpsFrame) {
_vpsFrame = std::make_shared<H265Frame>();
_vpsFrame->type = H265Frame::NAL_VPS;
_vpsFrame->buffer.assign("\x0\x0\x0\x1", 4);
_vpsFrame->buffer.append(_vps);
_vpsFrame->iPrefixSize = 4;
}
_vpsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_vpsFrame);
}
if (!_sps.empty()) {
if (!_spsFrame) {
_spsFrame = std::make_shared<H265Frame>();
_spsFrame->type = H265Frame::NAL_SPS;
_spsFrame->buffer.assign("\x0\x0\x0\x1", 4);
_spsFrame->buffer.append(_sps);
_spsFrame->iPrefixSize = 4;
}
_spsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_spsFrame);
}
if (!_pps.empty()) {
if (!_ppsFrame) {
_ppsFrame = std::make_shared<H265Frame>();
_ppsFrame->type = H265Frame::NAL_PPS;
_ppsFrame->buffer.assign("\x0\x0\x0\x1", 4);
_ppsFrame->buffer.append(_pps);
_ppsFrame->iPrefixSize = 4;
}
_ppsFrame->timeStamp = frame->stamp();
VideoTrack::inputFrame(_ppsFrame);
}
}
private: private:
string _vps; string _vps;
string _sps; string _sps;
string _pps; string _pps;
H265Frame::Ptr _vpsFrame; H265Frame::Ptr _vpsFrame;
H265Frame::Ptr _spsFrame; H265Frame::Ptr _spsFrame;
H265Frame::Ptr _ppsFrame; H265Frame::Ptr _ppsFrame;
bool _last_frame_is_idr = false;
}; };