amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 03:10:04 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

优化推流器代码

Browse Source
This commit is contained in:
xiongziliang 2019-03-28 09:43:47 +08:00
parent f6b963f0f2
commit d208f69730
4 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Rtmp/RtmpPusher.cpp
View File

@ -63,6 +63,20 @@ void RtmpPusher::teardown() {
}
}
void RtmpPusher::onPublishResult(const SockException &ex) {
_pPublishTimer.reset();
if(_onPublished){
_onPublished(ex);
_onPublished = nullptr;
}else if(_onShutdown){
_onShutdown(ex);
}
if(ex){
teardown();
}
}
void RtmpPusher::publish(const string &strUrl) {
teardown();
string strHost = FindField(strUrl.data(), "://", "/");
@ -93,7 +107,6 @@ void RtmpPusher::publish(const string &strUrl) {
return false;
}
strongSelf->onPublishResult(SockException(Err_timeout,"publish rtmp timeout"));
strongSelf->teardown();
return false;
},getPoller()));
@ -105,7 +118,7 @@ void RtmpPusher::publish(const string &strUrl) {
}
void RtmpPusher::onErr(const SockException &ex){
onShutdown(ex);
onPublishResult(ex);
}
void RtmpPusher::onConnect(const SockException &err){
if(err) {
@ -129,8 +142,6 @@ void RtmpPusher::onRecv(const Buffer::Ptr &pBuf){
} catch (exception &e) {
SockException ex(Err_other, e.what());
onPublishResult(ex);
onShutdown(ex);
teardown();
}
}
@ -207,8 +218,7 @@ inline void RtmpPusher::send_metaData(){
_pRtmpReader->setDetachCB([weakSelf](){
auto strongSelf = weakSelf.lock();
if(strongSelf){
strongSelf->onShutdown(SockException(Err_other,"媒体源被释放"));
strongSelf->teardown();
strongSelf->onPublishResult(SockException(Err_other,"媒体源被释放"));
}
});
onPublishResult(SockException(Err_success,"success"));

14
src/Rtmp/RtmpPusher.h
View File

@ -63,19 +63,7 @@ protected:
send(buffer);
}
private:
void onShutdown(const SockException &ex) {
_pPublishTimer.reset();
if(_onShutdown){
_onShutdown(ex);
}
_pRtmpReader.reset();
}
void onPublishResult(const SockException &ex) {
_pPublishTimer.reset();
if(_onPublished){
_onPublished(ex);
}
}
void onPublishResult(const SockException &ex);
template<typename FUN>
inline void addOnResultCB(const FUN &fun) {

15
src/Rtsp/RtspPusher.cpp
View File

@ -62,17 +62,15 @@ void RtspPusher::publish(const string &strUrl) {
publish(url,user,pwd,eType);
}
void RtspPusher::onShutdown(const SockException &ex) {
if(_onShutdown){
_onShutdown(ex);
}
teardown();
}
void RtspPusher::onPublishResult(const SockException &ex) {
_pPublishTimer.reset();
if(_onPublished){
_onPublished(ex);
_onPublished = nullptr;
}else if(_onShutdown){
_onShutdown(ex);
}
if(ex){
teardown();
}
@ -128,7 +126,7 @@ void RtspPusher::publish(const string & strUrl, const string &strUser, const str
}
void RtspPusher::onErr(const SockException &ex) {
onShutdown(ex);
onPublishResult(ex);
}
void RtspPusher::onConnect(const SockException &err) {
@ -145,7 +143,6 @@ void RtspPusher::onRecv(const Buffer::Ptr &pBuf){
} catch (exception &e) {
SockException ex(Err_other, e.what());
onPublishResult(ex);
onShutdown(ex);
}
}
@ -366,7 +363,7 @@ void RtspPusher::sendRecord() {
_pRtspReader->setDetachCB([weakSelf](){
auto strongSelf = weakSelf.lock();
if(strongSelf){
strongSelf->onShutdown(SockException(Err_other,"媒体源被释放"));
strongSelf->onPublishResult(SockException(Err_other,"媒体源被释放"));
}
});
if(_eType != Rtsp::RTP_TCP){

1
src/Rtsp/RtspPusher.h
View File

@ -50,7 +50,6 @@ protected:
void onRtpPacket(const char *data,uint64_t len) override {};
private:
void publish(const string &strUrl, const string &strUser, const string &strPwd, Rtsp::eRtpType eType );
void onShutdown(const SockException &ex);
void onPublishResult(const SockException &ex);
void sendAnnounce();