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

播放器支持超时时间的配置项

Browse Source 
优化函数命名
This commit is contained in:
xiongziliang
2019-03-01 14:23:28 +08:00
parent e240044f2f
commit 40a7913bf9
10 changed files with 111 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Player/PlayerBase.cpp
View File

@@ -39,8 +39,13 @@ const char PlayerBase::kRtspUser[] = "rtsp_user" ;
const char PlayerBase::kRtspPwd[] = "rtsp_pwd";
const char PlayerBase::kRtspPwdIsMD5[] = "rtsp_pwd_md5";
const char PlayerBase::kPlayTimeoutMS[] = "play_timeout_ms";
const char PlayerBase::kMediaTimeoutMS[] = "media_timeout_ms";
const char PlayerBase::kBeatIntervalMS[] = "beat_interval_ms";
const char PlayerBase::kMaxAnalysisMS[] = "max_analysis_ms";
PlayerBase::Ptr PlayerBase::createPlayer(const char* strUrl) {
PlayerBase::Ptr PlayerBase::createPlayer(const char* strUrl) {
static auto releasePlayer = [](PlayerBase *ptr){
onceToken token(nullptr,[&](){
delete ptr;
@@ -57,6 +62,13 @@ PlayerBase::Ptr PlayerBase::createPlayer(const char* strUrl) {
return PlayerBase::Ptr(new RtspPlayerImp(),releasePlayer);
}
PlayerBase::PlayerBase() {
this->mINI::operator[](kPlayTimeoutMS) = 10000;
this->mINI::operator[](kMediaTimeoutMS) = 5000;
this->mINI::operator[](kBeatIntervalMS) = 5000;
this->mINI::operator[](kMaxAnalysisMS) = 2000;
}
///////////////////////////Demuxer//////////////////////////////
bool Demuxer::isInited(int analysisMs) {
if(_ticker.createdTime() < analysisMs){

30
src/Player/PlayerBase.h
View File

@@ -56,7 +56,7 @@ public:
* @param analysisMs 数据流最大分析时间 单位毫秒
* @return
*/
virtual bool isInited(int analysisMs = 2000) { return true; }
virtual bool isInited(int analysisMs) { return true; }
/**
* 获取全部的Track
@@ -103,10 +103,19 @@ public:
static const char kRtspUser[];
//rtsp认证用用户密码，可以是明文也可以是md5,md5密码生成方式 md5(username:realm:password)
static const char kRtspPwd[];
//rtsp认证用用户密码是否为md5
//rtsp认证用用户密码是否为md5类型
static const char kRtspPwdIsMD5[];
//播放超时时间，默认10,000 毫秒
static const char kPlayTimeoutMS[];
//rtp/rtmp包接收超时时间，默认5000秒
static const char kMediaTimeoutMS[];
//rtsp/rtmp心跳时间,默认5000毫秒
static const char kBeatIntervalMS[];
//Track编码格式探测最大时间，单位毫秒，默认2000
static const char kMaxAnalysisMS[];
PlayerBase(){}
PlayerBase();
virtual ~PlayerBase(){}
/**
@@ -187,7 +196,7 @@ public:
_playResultCB = cb;
}
bool isInited(int analysisMs = 2000) override{
bool isInited(int analysisMs) override{
if (_parser) {
return _parser->isInited(analysisMs);
}
@@ -243,21 +252,20 @@ protected:
_playResultCB = nullptr;
return;
}
//播放成功
if(isInited()){
//播放成功后，我们还必须等待各个Track初始化完毕才能回调告知已经初始化完毕
if(isInited(INT_MAX)){
//初始化完毕则立即回调
_playResultCB(ex);
_playResultCB = nullptr;
return;
}
//播放成功却未初始化完毕
//播放成功却未初始化完毕，这个时候不回调汇报播放成功
}
void checkInited(){
void checkInited(int analysisMs){
if(!_playResultCB){
return;
}
if(isInited()){
if(isInited(analysisMs)){
_playResultCB(SockException(Err_success,"play success"));
_playResultCB = nullptr;
}
@@ -285,7 +293,7 @@ public:
* @param analysisMs 数据流最大分析时间 单位毫秒
* @return
*/
bool isInited(int analysisMs = 2000) override;
bool isInited(int analysisMs) override;
/**
* 获取所有可用Track，请在isInited()返回true时调用