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

Static RTSP gedeelte (grotendeels, nog geen audio support, maar dat is 2 regels editen) af, RTP vanavond fixen

Browse source
This commit is contained in:
Erik Zandvliet 2011-08-30 16:38:37 +02:00
parent de84b840c3
commit 69a9048436
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Connector_RTSP/main.cpp
View file

@ -26,8 +26,9 @@
int RTSP_Handler( Socket::Connection conn ) { int RTSP_Handler( Socket::Connection conn ) {
bool ready4data = false; bool ready4data = false;
FLV::Tag tag;///< Temporary tag buffer for incoming video data. FLV::Tag tag;///< Temporary tag buffer for incoming video data.
bool inited = false; bool InitVideo = false;
bool firstvideo = true; bool InitAudio = true;
bool VideoMeta = false;
std::string PreviousRequest = ""; std::string PreviousRequest = "";
Socket::Connection ss(-1); Socket::Connection ss(-1);
HTTP::Parser HTTP_R, HTTP_S; HTTP::Parser HTTP_R, HTTP_S;
@ -42,7 +43,7 @@ int RTSP_Handler( Socket::Connection conn ) {
if( HTTP_R.method == "OPTIONS" ) { if( HTTP_R.method == "OPTIONS" ) {
HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() ); HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() );
HTTP_S.SetHeader( "Public", "DESCRIBE, SETUP, TEARDOWN, PLAY" ); HTTP_S.SetHeader( "Public", "DESCRIBE, SETUP, TEARDOWN, PLAY" );
HTTP_S.SetBody( "\r\n" ); HTTP_S.SetBody( "\r\n\r\n" );
fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() ); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() );
conn.write( HTTP_S.BuildResponse( "200", "OK" ) ); conn.write( HTTP_S.BuildResponse( "200", "OK" ) );
} else if ( HTTP_R.method == "DESCRIBE" ) { } else if ( HTTP_R.method == "DESCRIBE" ) {
@ -56,7 +57,7 @@ int RTSP_Handler( Socket::Connection conn ) {
fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() ); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() );
conn.write( HTTP_S.BuildResponse( "200", "OK" ) ); conn.write( HTTP_S.BuildResponse( "200", "OK" ) );
} }
} else if ( HTTP_R. method == "SETUP" ) { } else if ( HTTP_R.method == "SETUP" ) {
std::string temp = HTTP_R.GetHeader("Transport"); std::string temp = HTTP_R.GetHeader("Transport");
int ClientRTPLoc = temp.find( "client_port=" ) + 12; int ClientRTPLoc = temp.find( "client_port=" ) + 12;
int PortSpacer = temp.find( "-", ClientRTPLoc ); int PortSpacer = temp.find( "-", ClientRTPLoc );
@ -69,9 +70,25 @@ int RTSP_Handler( Socket::Connection conn ) {
} else { } else {
HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() ); HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() );
HTTP_S.SetHeader( "Session", time(NULL) ); HTTP_S.SetHeader( "Session", time(NULL) );
HTTP_S.SetHeader( "Transport", HTTP_R.GetHeader( "Transport" ) + ";server_port=50000-50001" );
HTTP_S.SetBody( "\r\n\r\n" );
fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() ); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() );
conn.write( HTTP_S.BuildResponse( "200", "OK" ) ); conn.write( HTTP_S.BuildResponse( "200", "OK" ) );
} }
} else if( HTTP_R.method == "PLAY" ) {
if( HTTP_R.GetHeader( "Range" ).substr(0,4) != "npt=" ) {
fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "501", "Not Implemented" ).c_str() );
conn.write( HTTP_S.BuildResponse( "501", "Not Implemented" ) );
} else {
HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() );
HTTP_S.SetHeader( "Session", HTTP_R.GetHeader( "Session" ) );
HTTP_S.SetHeader( "Range", HTTP_R.GetHeader( "Range" ) );
HTTP_S.SetHeader( "RTP-Info", "url=" + HTTP_R.url + ";seq=0;rtptime=0" );
HTTP_S.SetBody( "\r\n\r\n" );
fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() );
conn.write( HTTP_S.BuildResponse( "200", "OK" ) );
InitVideo = true;
}
} else { } else {
fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "501", "Not Implemented" ).c_str() ); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "501", "Not Implemented" ).c_str() );
conn.write( HTTP_S.BuildResponse( "501", "Not Implemented" ) ); conn.write( HTTP_S.BuildResponse( "501", "Not Implemented" ) );
@ -81,6 +98,9 @@ int RTSP_Handler( Socket::Connection conn ) {
if( PerRequest ) { if( PerRequest ) {
conn.close(); conn.close();
} }
if( InitVideo ) {
}
} }
/* if( !inited ) { /* if( !inited ) {
ss = Socket::Connection("/tmp/shared_socket_fifa"); ss = Socket::Connection("/tmp/shared_socket_fifa");