hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RTSP now counts UDP bytes in/out on the main TCP connection

Browse source
This commit is contained in:
Thulinma 2017-02-01 15:31:30 +01:00
parent 7b1ef6c76e
commit 640a1ec575
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/output/output_rtsp.cpp
View file

@ -10,6 +10,9 @@
#include <sys/stat.h> #include <sys/stat.h>
namespace Mist { namespace Mist {
Socket::Connection * mainConn = 0;
OutRTSP::OutRTSP(Socket::Connection & myConn) : Output(myConn){ OutRTSP::OutRTSP(Socket::Connection & myConn) : Output(myConn){
connectedAt = Util::epoch() + 2208988800ll; connectedAt = Util::epoch() + 2208988800ll;
pausepoint = 0; pausepoint = 0;
@ -19,6 +22,7 @@ namespace Mist {
expectTCP = false; expectTCP = false;
isPushing = false; isPushing = false;
lastTimeSync = 0; lastTimeSync = 0;
mainConn = &myConn;
} }
/// Function used to send RTP packets over UDP /// Function used to send RTP packets over UDP
@ -28,6 +32,7 @@ namespace Mist {
///\param channel Not used here, but is kept for compatibility with sendTCP ///\param channel Not used here, but is kept for compatibility with sendTCP
void sendUDP(void * socket, char * data, unsigned int len, unsigned int channel) { void sendUDP(void * socket, char * data, unsigned int len, unsigned int channel) {
((Socket::UDPConnection *) socket)->SendNow(data, len); ((Socket::UDPConnection *) socket)->SendNow(data, len);
if (mainConn){mainConn->addUp(len);}
} }
@ -469,6 +474,7 @@ namespace Mist {
continue; continue;
} }
lastRecv = Util::epoch();//prevent disconnect of idle TCP connection when using UDP lastRecv = Util::epoch();//prevent disconnect of idle TCP connection when using UDP
myConn.addDown(s.data_len);
RTP::Packet pack(s.data, s.data_len); RTP::Packet pack(s.data, s.data_len);
if (!it->second.rtpSeq){it->second.rtpSeq = pack.getSequence();} if (!it->second.rtpSeq){it->second.rtpSeq = pack.getSequence();}
//packet is very early - assume dropped after 10 packets //packet is very early - assume dropped after 10 packets