mirror/ZLMediaKit
2
0
Fork 1
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2025-02-05 13:09:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

尝试解决多个联系IDR帧导致无法播放的bug

Browse Source
This commit is contained in:
xiongziliang 2018-11-16 14:46:08 +08:00
parent 6df77fc908
commit 7586070255
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Extension/H264.h
View File

@ -205,7 +205,6 @@ public:
*/
void inputFrame(const Frame::Ptr &frame) override{
int type = H264_TYPE(*((uint8_t *)frame->data() + frame->prefixSize()));
switch (type){
case H264Frame::NAL_SPS:{
//sps
@ -220,7 +219,7 @@ public:
case H264Frame::NAL_IDR:{
//I
if(!_sps.empty()){
if(!_sps.empty() && _last_frame_type != H264Frame::NAL_IDR){
if(!_spsFrame)
{
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
@ -235,7 +234,7 @@ public:
VideoTrack::inputFrame(_spsFrame);
}
if(!_pps.empty()){
if(!_pps.empty() && _last_frame_type != H264Frame::NAL_IDR){
if(!_ppsFrame)
{
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
@ -250,12 +249,14 @@ public:
VideoTrack::inputFrame(_ppsFrame);
}
VideoTrack::inputFrame(frame);
_last_frame_type = type;
}
break;
case H264Frame::NAL_B_P:{
//B or P
VideoTrack::inputFrame(frame);
_last_frame_type = type;
}
break;
}
@ -280,6 +281,7 @@ private:
int _width = 0;
int _height = 0;
float _fps = 0;
int _last_frame_type = -1;
H264Frame::Ptr _spsFrame;
H264Frame::Ptr _ppsFrame;
};