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

Minor RTMP efficiency improvements, fixed CPU time bug in Buffer process when idle clients are connected.

Browse source
This commit is contained in:
Thulinma 2013-11-21 13:47:50 +01:00
parent 825bd292f7
commit c69347f4e0
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/buffer/buffer.cpp
View file

@ -240,7 +240,7 @@ namespace Buffer {
} }
} }
} }
if (usr->myRing->waiting){ if (usr->myRing->waiting || !usr->myRing->playCount){
Util::sleep(300); //sleep 5ms Util::sleep(300); //sleep 5ms
} }
} }

17
src/connectors/conn_rtmp.cpp
View file

@ -44,6 +44,7 @@ namespace Connector_RTMP {
Socket::Connection Socket; ///< A copy of the user socket to allow helper functions to directly send data. Socket::Connection Socket; ///< A copy of the user socket to allow helper functions to directly send data.
Socket::Connection ss; ///< Socket connected to server. Socket::Connection ss; ///< Socket connected to server.
std::string streamName; ///< Stream that will be opened. std::string streamName; ///< Stream that will be opened.
std::string app_name; ///< Name of the application that was opened
///\brief Sends a RTMP command either in AMF or AMF3 mode. ///\brief Sends a RTMP command either in AMF or AMF3 mode.
///\param amfReply The data to be sent over RTMP. ///\param amfReply The data to be sent over RTMP.
@ -97,6 +98,8 @@ namespace Connector_RTMP {
} }
} }
#endif #endif
app_name = amfData.getContentP(2)->getContentP("tcUrl")->StrValue();
app_name = app_name.substr(app_name.find('/', 7) + 1);
RTMPStream::chunk_snd_max = 4096; RTMPStream::chunk_snd_max = 4096;
Socket.Send(RTMPStream::SendCTL(1, RTMPStream::chunk_snd_max)); //send chunk size max (msg 1) Socket.Send(RTMPStream::SendCTL(1, RTMPStream::chunk_snd_max)); //send chunk size max (msg 1)
Socket.Send(RTMPStream::SendCTL(5, RTMPStream::snd_window_size)); //send window acknowledgement size (msg 5) Socket.Send(RTMPStream::SendCTL(5, RTMPStream::snd_window_size)); //send window acknowledgement size (msg 5)
@ -193,8 +196,10 @@ namespace Connector_RTMP {
return; return;
} }
ss.Send("P "); ss.Send("P ");
ss.Send(Socket.getHost().c_str()); ss.Send(Socket.getHost());
ss.Send("\n"); ss.Send(" ");
ss.Send(app_name);
ss.SendNow("\n");
streamReset = true; streamReset = true;
noStats = true; noStats = true;
} }
@ -257,8 +262,8 @@ namespace Connector_RTMP {
amfReply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337)); amfReply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
sendCommand(amfReply, playMessageType, playStreamId); sendCommand(amfReply, playMessageType, playStreamId);
ss.Send("s "); ss.Send("s ");
ss.Send(JSON::Value((long long int)amfData.getContentP(3)->NumValue()).asString().c_str()); ss.Send(JSON::Value((long long int)amfData.getContentP(3)->NumValue()).asString());
ss.Send("\n"); ss.SendNow("\n");
return; return;
} //seek } //seek
if ((amfData.getContentP(0)->StrValue() == "pauseRaw") || (amfData.getContentP(0)->StrValue() == "pause")){ if ((amfData.getContentP(0)->StrValue() == "pauseRaw") || (amfData.getContentP(0)->StrValue() == "pause")){
@ -277,7 +282,7 @@ namespace Connector_RTMP {
amfReply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337)); amfReply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
sendCommand(amfReply, playMessageType, playStreamId); sendCommand(amfReply, playMessageType, playStreamId);
}else{ }else{
ss.Send("p\n"); //start playing ss.SendNow("p\n"); //start playing
//send a status reply //send a status reply
AMF::Object amfReply("container", AMF::AMF0_DDV_CONTAINER); AMF::Object amfReply("container", AMF::AMF0_DDV_CONTAINER);
amfReply.addContent(AMF::Object("", "onStatus")); //status reply amfReply.addContent(AMF::Object("", "onStatus")); //status reply
@ -586,7 +591,7 @@ namespace Connector_RTMP {
long long int now = Util::epoch(); long long int now = Util::epoch();
if (now != lastStats){ if (now != lastStats){
lastStats = now; lastStats = now;
ss.SendNow(Socket.getStats("RTMP").c_str()); ss.SendNow(Socket.getStats("RTMP"));
} }
} }
if (ss.spool()){ if (ss.spool()){