Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-03 00:47:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

MP4、hls适配新代码

Browse Source
This commit is contained in:
xiongziliang
2018-10-28 00:15:27 +08:00
parent 83a0ee8595
commit 6364b14762
11 changed files with 200 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Player/Track.h
View File

@@ -238,21 +238,29 @@ public:
case 5:{
//I
if(!_sps.empty()){
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
insertFrame->timeStamp = frame->stamp();
insertFrame->type = 7;
insertFrame->buffer = _sps;
insertFrame->iPrefixSize = 0;
VideoTrack::inputFrame(insertFrame);
if(!_spsFrame){
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
insertFrame->timeStamp = frame->stamp();
insertFrame->type = 7;
insertFrame->buffer.assign("\x0\x0\x0\x1");
insertFrame->buffer.append(_sps);
insertFrame->iPrefixSize = 4;
_spsFrame = insertFrame;
}
VideoTrack::inputFrame(_spsFrame);
}
if(!_pps.empty()){
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
insertFrame->timeStamp = frame->stamp();
insertFrame->type = 8;
insertFrame->buffer = _pps;
insertFrame->iPrefixSize = 0;
VideoTrack::inputFrame(insertFrame);
if(!_ppsFrame){
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
insertFrame->timeStamp = frame->stamp();
insertFrame->type = 8;
insertFrame->buffer.assign("\x0\x0\x0\x1");
insertFrame->buffer.append(_pps);
insertFrame->iPrefixSize = 4;
_ppsFrame = insertFrame;
}
VideoTrack::inputFrame(_ppsFrame);
}
VideoTrack::inputFrame(frame);
}
@@ -282,6 +290,8 @@ private:
int _width = 0;
int _height = 0;
float _fps = 0;
H264Frame::Ptr _spsFrame;
H264Frame::Ptr _ppsFrame;
};
/**