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

修复rtmp推流器bug/更新网络库

Browse Source
This commit is contained in:
xiongziliang 2018-06-24 14:49:21 +08:00
parent 806cf29eac
commit ae5482ec61
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZLToolKit

@ -1 +1 @@
Subproject commit 44f6034fc0d222a15f4f8ecc1ecc4da6d7e9786b Subproject commit 11c368c17c4f95f73d7f93bebd4573b31e2e296d

1
src/Rtmp/RtmpPusher.h
View File

@ -75,6 +75,7 @@ private:
if(m_onShutdown){ if(m_onShutdown){
m_onShutdown(ex); m_onShutdown(ex);
} }
m_pRtmpReader.reset();
} }
void onPublishResult(const SockException &ex) { void onPublishResult(const SockException &ex) {
m_pPublishTimer.reset(); m_pPublishTimer.reset();

3
tests/test_rtmpPusher.cpp
View File

@ -108,6 +108,7 @@ int domain(const string &playUrl, const string &pushUrl) {
//事件轮询 //事件轮询
EventPoller::Instance().runLoop(); EventPoller::Instance().runLoop();
pusher.reset();
} }
//删除事件监听 //删除事件监听
NoticeCenter::Instance().delListener(nullptr); NoticeCenter::Instance().delListener(nullptr);
@ -121,7 +122,7 @@ int domain(const string &playUrl, const string &pushUrl) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
return domain("rtmp://live.hkstv.hk.lxdns.com/live/hks", "rtmp://jizan.iok.la/live/stream"); return domain("rtmp://live.hkstv.hk.lxdns.com/live/hks", "rtmp://127.0.0.1/live/stream");
} }