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

优化播放器相关代码

Browse Source
This commit is contained in:
xiongziliang
2019-03-28 12:02:59 +08:00
parent 6045b1b8f8
commit fed8a7b81f
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Rtmp/RtmpPlayer.h
View File

@@ -60,41 +60,12 @@ protected:
uint32_t getProgressMilliSecond() const;
void seekToMilliSecond(uint32_t ms);
protected:
void onShutdown_l(const SockException &ex) {
WarnL << ex.getErrCode() << " " << ex.what();
_pPlayTimer.reset();
_pMediaTimer.reset();
_pBeatTimer.reset();
onShutdown(ex);
}
void onMediaData_l(const RtmpPacket::Ptr &chunkData) {
_mediaTicker.resetTime();
onMediaData(chunkData);
}
void onPlayResult_l(const SockException &ex) {
WarnL << ex.getErrCode() << " " << ex.what();
_pPlayTimer.reset();
_pMediaTimer.reset();
if (!ex) {
_mediaTicker.resetTime();
weak_ptr<RtmpPlayer> weakSelf = dynamic_pointer_cast<RtmpPlayer>(shared_from_this());
int timeoutMS = (*this)[kMediaTimeoutMS].as<int>();
_pMediaTimer.reset( new Timer(timeoutMS / 2000.0, [weakSelf,timeoutMS]() {
auto strongSelf=weakSelf.lock();
if(!strongSelf) {
return false;
}
if(strongSelf->_mediaTicker.elapsedTime()> timeoutMS) {
//recv media timeout!
strongSelf->onShutdown_l(SockException(Err_timeout,"recv rtmp timeout"));
strongSelf->teardown();
return false;
}
return true;
},getPoller()));
}
onPlayResult(ex);
}
void onPlayResult_l(const SockException &ex);
//for Tcpclient
void onRecv(const Buffer::Ptr &pBuf) override;