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

兼容无config包的rtmp流

Browse Source
This commit is contained in:
xiongziliang 2019-04-09 11:25:36 +08:00
parent 26f813b1b5
commit 507eba76c7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Rtmp/RtmpMediaSource.h
View File

@ -100,6 +100,13 @@ public:
_bRegisted = true; _bRegisted = true;
} }
} else{ } else{
if(!_bRegisted){
//强制在3秒后注册，不管是否有metedata或config包
if(_ticker.createdTime() > 3 * 1000){
MediaSource::regist();
_bRegisted = true;
}
}
_mapStamp[pkt->typeId] = pkt->timeStamp; _mapStamp[pkt->typeId] = pkt->timeStamp;
_pRing->write(pkt,pkt->isVideoKeyFrame()); _pRing->write(pkt,pkt->isVideoKeyFrame());
} }
@ -130,6 +137,7 @@ protected:
int _iCfgFrameSize = -1; int _iCfgFrameSize = -1;
bool _bAsyncRegist = false; bool _bAsyncRegist = false;
bool _bRegisted = false; bool _bRegisted = false;
Ticker _ticker;
}; };
} /* namespace mediakit */ } /* namespace mediakit */