Nog een poging...

This commit is contained in:
Thulinma 2010-11-07 23:41:38 +01:00
parent 4a6de43ed7
commit 4ad85c9aac

View file

@ -79,68 +79,71 @@ int main(){
while (!ferror(CONN)){ while (!ferror(CONN) && !feof(CONN)){
//only parse input if available or not yet init'ed //only parse input if available or not yet init'ed
//rightnow = getNowMS(); //rightnow = getNowMS();
retval = epoll_wait(poller, events, 1, 1000); retval = epoll_wait(poller, events, 1, 1000);
if (retval){ if (retval){
fprintf(stderr, "Socket %i is now state %i, in is %i, out is %i\n", events[0].data.fd, events[0].events, EPOLLIN, EPOLLOUT); if (events[0].events & EPOLLIN){
parseChunk(); parseChunk();
fflush(CONN); fflush(CONN);
}
if (ready4data){
if (!inited){
//we are ready, connect the socket!
if (!ss.connect(streamname.c_str())){
#ifdef DEBUG
fprintf(stderr, "Could not connect to server!\n");
#endif
return 0;
}
FLV_Readheader(ss);//read the header, we don't want it
#ifdef DEBUG
fprintf(stderr, "Header read, starting to send video data...\n");
#endif
inited = true;
} }
//only send data if previous data has been ACK'ed... if (events[0].events & EPOLLOUT){
if (snd_cnt - snd_window_at < snd_window_size){ if (ready4data){
if (FLV_GetPacket(ss)){//able to read a full packet? if (!inited){
ts = FLVbuffer[7] * 256*256*256; //we are ready, connect the socket!
ts += FLVbuffer[4] * 256*256; if (!ss.connect(streamname.c_str())){
ts += FLVbuffer[5] * 256; #ifdef DEBUG
ts += FLVbuffer[6]; fprintf(stderr, "Could not connect to server!\n");
if (ts != 0){ #endif
if (fts == 0){fts = ts;ftst = getNowMS();} return 0;
ts -= fts; }
FLVbuffer[7] = ts / (256*256*256); FLV_Readheader(ss);//read the header, we don't want it
FLVbuffer[4] = ts / (256*256); #ifdef DEBUG
FLVbuffer[5] = ts / 256; fprintf(stderr, "Header read, starting to send video data...\n");
FLVbuffer[6] = ts % 256; #endif
ts += ftst; inited = true;
}else{ }
ftst = getNowMS(); //only send data if previous data has been ACK'ed...
FLVbuffer[7] = ftst / (256*256*256); if (snd_cnt - snd_window_at < snd_window_size){
FLVbuffer[4] = ftst / (256*256); if (FLV_GetPacket(ss)){//able to read a full packet?
FLVbuffer[5] = ftst / 256; ts = FLVbuffer[7] * 256*256*256;
FLVbuffer[6] = ftst % 256; ts += FLVbuffer[4] * 256*256;
ts += FLVbuffer[5] * 256;
ts += FLVbuffer[6];
if (ts != 0){
if (fts == 0){fts = ts;ftst = getNowMS();}
ts -= fts;
FLVbuffer[7] = ts / (256*256*256);
FLVbuffer[4] = ts / (256*256);
FLVbuffer[5] = ts / 256;
FLVbuffer[6] = ts % 256;
ts += ftst;
}else{
ftst = getNowMS();
FLVbuffer[7] = ftst / (256*256*256);
FLVbuffer[4] = ftst / (256*256);
FLVbuffer[5] = ftst / 256;
FLVbuffer[6] = ftst % 256;
}
SendMedia((unsigned char)FLVbuffer[0], (unsigned char *)FLVbuffer+11, FLV_len-15, ts);
FLV_Dump();//dump packet and get ready for next
}
if ((SWBerr != SWBaseSocket::ok) && (SWBerr != SWBaseSocket::notReady)){
#ifdef DEBUG
fprintf(stderr, "No more data! :-( (%s)\n", SWBerr.get_error().c_str());
#endif
return 0;//no more input possible! Fail immediately.
}
} }
SendMedia((unsigned char)FLVbuffer[0], (unsigned char *)FLVbuffer+11, FLV_len-15, ts);
FLV_Dump();//dump packet and get ready for next
} }
if ((SWBerr != SWBaseSocket::ok) && (SWBerr != SWBaseSocket::notReady)){ //send ACK if we received a whole window
#ifdef DEBUG if (rec_cnt - rec_window_at > rec_window_size){
fprintf(stderr, "No more data! :-( (%s)\n", SWBerr.get_error().c_str()); rec_window_at = rec_cnt;
#endif SendCTL(3, rec_cnt);//send ack (msg 3)
return 0;//no more input possible! Fail immediately.
} }
} }
} }
//send ACK if we received a whole window
if (rec_cnt - rec_window_at > rec_window_size){
rec_window_at = rec_cnt;
SendCTL(3, rec_cnt);//send ack (msg 3)
}
} }
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "User disconnected.\n"); fprintf(stderr, "User disconnected.\n");