Werkende RTMP connector! WHEEEE! Also, RTMPf weggegooit. Er is geen ruimte voor faal in dit bedrijf!
This commit is contained in:
parent
fbd0520264
commit
273f30784b
22 changed files with 123 additions and 2015 deletions
|
@ -1,4 +1,10 @@
|
|||
#undef DEBUG
|
||||
//debugging level 0 = nothing
|
||||
//debugging level 1 = critical errors
|
||||
//debugging level 2 = errors
|
||||
//debugging level 3 = status information
|
||||
//debugging level 4 = extremely verbose status information
|
||||
#define DEBUG 3
|
||||
|
||||
#include <iostream>
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
|
@ -27,6 +33,12 @@ int server_socket = 0;
|
|||
|
||||
void termination_handler (int signum){
|
||||
if (server_socket == 0) return;
|
||||
switch (signum){
|
||||
case SIGINT: break;
|
||||
case SIGHUP: break;
|
||||
case SIGTERM: break;
|
||||
default: return; break;
|
||||
}
|
||||
close(server_socket);
|
||||
server_socket = 0;
|
||||
}
|
||||
|
@ -41,9 +53,16 @@ int main(int argc, char ** argv){
|
|||
sigaction (SIGHUP, &new_action, NULL);
|
||||
sigaction (SIGTERM, &new_action, NULL);
|
||||
|
||||
server_socket = DDV_Listen(1936);
|
||||
if ((argc < 2) || (argv[1] == "nd")){
|
||||
if (server_socket > 0){daemon(1, 0);}else{return 1;}
|
||||
server_socket = DDV_Listen(1935);
|
||||
fprintf(stderr, "Made a listening socket on port 1936...");
|
||||
if ((argc < 2) || (strcmp(argv[1], "nd") != 0)){
|
||||
if (server_socket > 0){
|
||||
daemon(1, 0);
|
||||
fprintf(stderr, "Going into background mode...");
|
||||
}else{
|
||||
fprintf(stderr, "Error: could not make listening socket");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
int status;
|
||||
while (server_socket > 0){
|
||||
|
@ -54,7 +73,7 @@ int main(int argc, char ** argv){
|
|||
if (myid == 0){
|
||||
break;
|
||||
}else{
|
||||
printf("Spawned new process %i for handling socket %i\n", (int)myid, CONN_fd);
|
||||
fprintf(stderr, "Spawned new process %i for handling socket %i\n", (int)myid, CONN_fd);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -71,23 +90,16 @@ int main(int argc, char ** argv){
|
|||
//first timestamp set
|
||||
firsttime = getNowMS();
|
||||
|
||||
#ifdef DEBUG
|
||||
fprintf(stderr, "Doing handshake...\n");
|
||||
#endif
|
||||
if (doHandshake()){
|
||||
#ifdef DEBUG
|
||||
#if DEBUG >= 4
|
||||
fprintf(stderr, "Handshake succcess!\n");
|
||||
#endif
|
||||
}else{
|
||||
#ifdef DEBUG
|
||||
#if DEBUG >= 1
|
||||
fprintf(stderr, "Handshake fail!\n");
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
fprintf(stderr, "Starting processing...\n");
|
||||
#endif
|
||||
|
||||
|
||||
int retval;
|
||||
int poller = epoll_create(1);
|
||||
|
@ -104,10 +116,17 @@ int main(int argc, char ** argv){
|
|||
while (!socketError && !All_Hell_Broke_Loose){
|
||||
//only parse input if available or not yet init'ed
|
||||
//rightnow = getNowMS();
|
||||
retval = epoll_wait(poller, events, 1, 0);
|
||||
if ((retval > 0) || !ready4data || (snd_cnt - snd_window_at >= snd_window_size)){
|
||||
if (DDV_ready(CONN_fd)){
|
||||
parseChunk();
|
||||
retval = epoll_wait(poller, events, 1, 1);
|
||||
if ((retval > 0) || !ready4data){// || (snd_cnt - snd_window_at >= snd_window_size)
|
||||
switch (DDV_ready(CONN_fd)){
|
||||
case 0:
|
||||
socketError = true;
|
||||
#if DEBUG >= 1
|
||||
fprintf(stderr, "User socket is disconnected.\n");
|
||||
#endif
|
||||
break;
|
||||
case -1: break;//not ready yet
|
||||
default: parseChunk(); break;
|
||||
}
|
||||
}
|
||||
if (ready4data){
|
||||
|
@ -115,47 +134,57 @@ int main(int argc, char ** argv){
|
|||
//we are ready, connect the socket!
|
||||
ss = DDV_OpenUnix(streamname);
|
||||
if (ss <= 0){
|
||||
#ifdef DEBUG
|
||||
#if DEBUG >= 1
|
||||
fprintf(stderr, "Could not connect to server!\n");
|
||||
#endif
|
||||
return 0;
|
||||
socketError = 1;
|
||||
break;
|
||||
}
|
||||
ev.events = EPOLLIN;
|
||||
ev.data.fd = ss;
|
||||
epoll_ctl(sspoller, EPOLL_CTL_ADD, ss, &ev);
|
||||
#ifdef DEBUG
|
||||
#if DEBUG >= 3
|
||||
fprintf(stderr, "Everything connected, starting to send video data...\n");
|
||||
#endif
|
||||
inited = true;
|
||||
}
|
||||
|
||||
retval = epoll_wait(poller, events, 1, 50);
|
||||
if (DDV_ready(ss)){
|
||||
if (FLV_GetPacket(tag, ss)){//able to read a full packet?
|
||||
ts = tag->data[7] * 256*256*256;
|
||||
ts += tag->data[4] * 256*256;
|
||||
ts += tag->data[5] * 256;
|
||||
ts += tag->data[6];
|
||||
if (ts != 0){
|
||||
if (fts == 0){fts = ts;ftst = getNowMS();}
|
||||
ts -= fts;
|
||||
tag->data[7] = ts / (256*256*256);
|
||||
tag->data[4] = ts / (256*256);
|
||||
tag->data[5] = ts / 256;
|
||||
tag->data[6] = ts % 256;
|
||||
ts += ftst;
|
||||
}else{
|
||||
ftst = getNowMS();
|
||||
tag->data[7] = ftst / (256*256*256);
|
||||
tag->data[4] = ftst / (256*256);
|
||||
tag->data[5] = ftst / 256;
|
||||
tag->data[6] = ftst % 256;
|
||||
}
|
||||
SendMedia((unsigned char)tag->data[0], (unsigned char *)tag->data+11, tag->len-15, ts);
|
||||
#ifdef DEBUG
|
||||
fprintf(stderr, "Sent a tag to %i\n", CONN_fd);
|
||||
retval = epoll_wait(poller, events, 1, 1);
|
||||
switch (DDV_ready(ss)){
|
||||
case 0:
|
||||
socketError = true;
|
||||
#if DEBUG >= 1
|
||||
fprintf(stderr, "Source socket is disconnected.\n");
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case -1: break;//not ready yet
|
||||
default:
|
||||
if (FLV_GetPacket(tag, ss)){//able to read a full packet?
|
||||
ts = tag->data[7] * 256*256*256;
|
||||
ts += tag->data[4] * 256*256;
|
||||
ts += tag->data[5] * 256;
|
||||
ts += tag->data[6];
|
||||
if (ts != 0){
|
||||
if (fts == 0){fts = ts;ftst = getNowMS();}
|
||||
ts -= fts;
|
||||
tag->data[7] = ts / (256*256*256);
|
||||
tag->data[4] = ts / (256*256);
|
||||
tag->data[5] = ts / 256;
|
||||
tag->data[6] = ts % 256;
|
||||
ts += ftst;
|
||||
}else{
|
||||
ftst = getNowMS();
|
||||
tag->data[7] = ftst / (256*256*256);
|
||||
tag->data[4] = ftst / (256*256);
|
||||
tag->data[5] = ftst / 256;
|
||||
tag->data[6] = ftst % 256;
|
||||
}
|
||||
SendMedia((unsigned char)tag->data[0], (unsigned char *)tag->data+11, tag->len-15, ts);
|
||||
#if DEBUG >= 4
|
||||
fprintf(stderr, "Sent a tag to %i\n", CONN_fd);
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
//send ACK if we received a whole window
|
||||
|
@ -164,10 +193,10 @@ int main(int argc, char ** argv){
|
|||
SendCTL(3, rec_cnt);//send ack (msg 3)
|
||||
}
|
||||
}
|
||||
//#ifdef DEBUG
|
||||
if (socketError){fprintf(stderr, "socketError\n");}
|
||||
close(CONN_fd);
|
||||
#if DEBUG >= 1
|
||||
if (All_Hell_Broke_Loose){fprintf(stderr, "All Hell Broke Loose\n");}
|
||||
fprintf(stderr, "User %i disconnected.\n", CONN_fd);
|
||||
//#endif
|
||||
#endif
|
||||
return 0;
|
||||
}//main
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue