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

PCM support in Flash-based protocols

Browse source
This commit is contained in:
Thulinma 2017-06-15 16:35:03 +02:00
parent de4fea643a
commit 5a44572896
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/output/output_rtmp.cpp
View file

@ -8,8 +8,8 @@
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>
namespace Mist { namespace Mist{
OutRTMP::OutRTMP(Socket::Connection & conn) : Output(conn) { OutRTMP::OutRTMP(Socket::Connection & conn) : Output(conn){
maxbps = config->getInteger("maxkbps")*128; maxbps = config->getInteger("maxkbps")*128;
if (config->getString("target").size() && config->getString("target").substr(0, 7) == "rtmp://"){ if (config->getString("target").size() && config->getString("target").substr(0, 7) == "rtmp://"){
streamName = config->getString("streamname"); streamName = config->getString("streamname");
@ -28,7 +28,7 @@ namespace Mist {
} }
size_t colon = host.find(':'); size_t colon = host.find(':');
if (colon != std::string::npos && colon != 0 && colon != host.size()) { if (colon != std::string::npos && colon != 0 && colon != host.size()){
port = atoi(host.substr(colon + 1, std::string::npos).c_str()); port = atoi(host.substr(colon + 1, std::string::npos).c_str());
host = host.substr(0, colon); host = host.substr(0, colon);
} }
@ -65,13 +65,13 @@ namespace Mist {
} }
*((uint32_t *)temp) = 0; //time zero *((uint32_t *)temp) = 0; //time zero
*(((uint32_t *)(temp + 4))) = htonl(0x01020304); //version 1 2 3 4 *(((uint32_t *)(temp + 4))) = htonl(0x01020304); //version 1 2 3 4
for (int i = 8; i < 3072; ++i) { for (int i = 8; i < 3072; ++i){
temp[i] = FILLER_DATA[i % sizeof(FILLER_DATA)]; temp[i] = FILLER_DATA[i % sizeof(FILLER_DATA)];
} //"random" data }//"random" data
myConn.SendNow(temp, 3072); myConn.SendNow(temp, 3072);
free(temp); free(temp);
setBlocking(true); setBlocking(true);
while (!myConn.Received().available(3073) && myConn.connected() && config->is_active) { while (!myConn.Received().available(3073) && myConn.connected() && config->is_active){
myConn.spool(); myConn.spool();
} }
if (!myConn || !config->is_active){return;} if (!myConn || !config->is_active){return;}
@ -101,7 +101,7 @@ namespace Mist {
HIGH_MSG("Waiting for server to acknowledge connect request..."); HIGH_MSG("Waiting for server to acknowledge connect request...");
}else{ }else{
setBlocking(true); setBlocking(true);
while (!conn.Received().available(1537) && conn.connected() && config->is_active) { while (!conn.Received().available(1537) && conn.connected() && config->is_active){
conn.spool(); conn.spool();
} }
if (!conn || !config->is_active){ if (!conn || !config->is_active){
@ -110,15 +110,15 @@ namespace Mist {
RTMPStream::handshake_in.append(conn.Received().remove(1537)); RTMPStream::handshake_in.append(conn.Received().remove(1537));
RTMPStream::rec_cnt += 1537; RTMPStream::rec_cnt += 1537;
if (RTMPStream::doHandshake()) { if (RTMPStream::doHandshake()){
conn.SendNow(RTMPStream::handshake_out); conn.SendNow(RTMPStream::handshake_out);
while (!conn.Received().available(1536) && conn.connected() && config->is_active) { while (!conn.Received().available(1536) && conn.connected() && config->is_active){
conn.spool(); conn.spool();
} }
conn.Received().remove(1536); conn.Received().remove(1536);
RTMPStream::rec_cnt += 1536; RTMPStream::rec_cnt += 1536;
HIGH_MSG("Handshake success"); HIGH_MSG("Handshake success");
} else { }else{
MEDIUM_MSG("Handshake fail (this is not a problem, usually)"); MEDIUM_MSG("Handshake fail (this is not a problem, usually)");
} }
setBlocking(false); setBlocking(false);
@ -532,7 +532,7 @@ namespace Mist {
Output::requestHandler(); Output::requestHandler();
} }
void OutRTMP::onRequest() { void OutRTMP::onRequest(){
parseChunk(myConn.Received()); parseChunk(myConn.Received());
} }
@ -568,7 +568,7 @@ namespace Mist {
/// current RTMP URL /// current RTMP URL
/// connected client host /// connected client host
/// ~~~~~~~~~~~~~~~ /// ~~~~~~~~~~~~~~~
void OutRTMP::parseAMFCommand(AMF::Object & amfData, int messageType, int streamId) { void OutRTMP::parseAMFCommand(AMF::Object & amfData, int messageType, int streamId){
MEDIUM_MSG("Received command: %s", amfData.Print().c_str()); MEDIUM_MSG("Received command: %s", amfData.Print().c_str());
HIGH_MSG("AMF0 command: %s", amfData.getContentP(0)->StrValue().c_str()); HIGH_MSG("AMF0 command: %s", amfData.getContentP(0)->StrValue().c_str());
if (amfData.getContentP(0)->StrValue() == "xsbwtest"){ if (amfData.getContentP(0)->StrValue() == "xsbwtest"){
@ -586,7 +586,7 @@ namespace Mist {
if (amfData.getContentP(2)->getContentP("objectEncoding")){ if (amfData.getContentP(2)->getContentP("objectEncoding")){
objencoding = amfData.getContentP(2)->getContentP("objectEncoding")->NumValue(); objencoding = amfData.getContentP(2)->getContentP("objectEncoding")->NumValue();
} }
if (amfData.getContentP(2)->getContentP("flashVer")) { if (amfData.getContentP(2)->getContentP("flashVer")){
UA = amfData.getContentP(2)->getContentP("flashVer")->StrValue(); UA = amfData.getContentP(2)->getContentP("flashVer")->StrValue();
} }
app_name = amfData.getContentP(2)->getContentP("tcUrl")->StrValue(); app_name = amfData.getContentP(2)->getContentP("tcUrl")->StrValue();
@ -959,7 +959,7 @@ namespace Mist {
WARN_MSG("Received error response: %s", amfData.Print().c_str()); WARN_MSG("Received error response: %s", amfData.Print().c_str());
return; return;
} }
if ((amfData.getContentP(0)->StrValue() == "_result") || (amfData.getContentP(0)->StrValue() == "onFCPublish") || (amfData.getContentP(0)->StrValue() == "onStatus")) { if ((amfData.getContentP(0)->StrValue() == "_result") || (amfData.getContentP(0)->StrValue() == "onFCPublish") || (amfData.getContentP(0)->StrValue() == "onStatus")){
if (isRecording() && amfData.getContentP(0)->StrValue() == "_result" && amfData.getContentP(1)->NumValue() == 1){ if (isRecording() && amfData.getContentP(0)->StrValue() == "_result" && amfData.getContentP(1)->NumValue() == 1){
{ {
AMF::Object amfReply("container", AMF::AMF0_DDV_CONTAINER); AMF::Object amfReply("container", AMF::AMF0_DDV_CONTAINER);