From 678bdcdbfd837b11c3cfe37bebd82f5da566bc72 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Fri, 6 Jul 2018 23:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8win32=E4=B8=8A?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZLToolKit | 2 +- src/Rtsp/RtpBroadCaster.cpp | 2 +- src/Rtsp/RtpBroadCaster.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ZLToolKit b/ZLToolKit index 8225192d..7edec2d0 160000 --- a/ZLToolKit +++ b/ZLToolKit @@ -1 +1 @@ -Subproject commit 8225192d05f058b02bcbd3847f392e0be0b59079 +Subproject commit 7edec2d0d689406b2b34413597061fdc387be0ee diff --git a/src/Rtsp/RtpBroadCaster.cpp b/src/Rtsp/RtpBroadCaster.cpp index d0a9a7c1..56e90188 100644 --- a/src/Rtsp/RtpBroadCaster.cpp +++ b/src/Rtsp/RtpBroadCaster.cpp @@ -148,7 +148,7 @@ RtpBroadCaster::RtpBroadCaster(const string &strLocalIp,const string &strVhost,c << strVhost << " " << strApp << " " << strStream; } -uint16_t RtpBroadCaster::getPort(int trackType){ +uint16_t RtpBroadCaster::getPort(TrackType trackType){ return m_apUdpSock[trackType]->get_local_port(); } string RtpBroadCaster::getIP(){ diff --git a/src/Rtsp/RtpBroadCaster.h b/src/Rtsp/RtpBroadCaster.h index 29199d7e..77a96d27 100644 --- a/src/Rtsp/RtpBroadCaster.h +++ b/src/Rtsp/RtpBroadCaster.h @@ -33,6 +33,7 @@ #include #include #include "Common/config.h" +#include "Rtsp.h" #include "RtspMediaSource.h" #include "Util/mini.h" #include "Network/Socket.h" @@ -74,7 +75,7 @@ public: virtual ~RtpBroadCaster(); static Ptr get(const string &strLocalIp,const string &strVhost,const string &strApp,const string &strStream); void setDetachCB(void *listener,const onDetach &cb); - uint16_t getPort(int trackType); + uint16_t getPort(TrackType trackType); string getIP(); private: static recursive_mutex g_mtx;