Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-15 20:45:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复播放器析构时调用虚函数的bug

Browse Source
This commit is contained in:
xiongziliang
2018-11-19 11:49:17 +08:00
parent 84129aefdf
commit 13bbb7b057
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Player/PlayerBase.cpp
View File

@@ -41,14 +41,20 @@ const char PlayerBase::kRtspPwdIsMD5[] = "rtsp_pwd_md5";
PlayerBase::Ptr PlayerBase::createPlayer(const char* strUrl) {
static auto releasePlayer = [](PlayerBase *ptr){
onceToken token(nullptr,[&](){
delete ptr;
});
ptr->teardown();
};
string prefix = FindField(strUrl, NULL, "://");
if (strcasecmp("rtsp",prefix.data()) == 0) {
return PlayerBase::Ptr(new RtspPlayerImp());
return PlayerBase::Ptr(new RtspPlayerImp(),releasePlayer);
}
if (strcasecmp("rtmp",prefix.data()) == 0) {
return PlayerBase::Ptr(new RtmpPlayerImp());
return PlayerBase::Ptr(new RtmpPlayerImp(),releasePlayer);
}
return PlayerBase::Ptr(new RtspPlayerImp());
return PlayerBase::Ptr(new RtspPlayerImp(),releasePlayer);
}
///////////////////////////Demuxer//////////////////////////////