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

Minder debugging

Browse source
This commit is contained in:
Thulinma 2010-11-08 20:15:47 +01:00
parent 0bda534d2b
commit 451a2563c4
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
util/flv_sock.cpp
View file

@ -52,9 +52,6 @@ bool ReadUntil(char * buffer, unsigned int count, unsigned int & sofar, int sock
//resizes FLV_Pack data field bigger if data doesn't fit //resizes FLV_Pack data field bigger if data doesn't fit
// (does not auto-shrink for speed!) // (does not auto-shrink for speed!)
bool FLV_GetPacket(FLV_Pack *& p, int sock){ bool FLV_GetPacket(FLV_Pack *& p, int sock){
int preflags = fcntl(sock, F_GETFL, 0);
int postflags = preflags | O_NONBLOCK;
fcntl(sock, F_SETFL, postflags);
static bool done = true; static bool done = true;
static unsigned int sofar = 0; static unsigned int sofar = 0;
if (!p){p = (FLV_Pack*)calloc(1, sizeof(FLV_Pack));} if (!p){p = (FLV_Pack*)calloc(1, sizeof(FLV_Pack));}
@ -79,7 +76,7 @@ bool FLV_GetPacket(FLV_Pack *& p, int sock){
p->len = p->data[3] + 15; p->len = p->data[3] + 15;
p->len += (p->data[2] << 8); p->len += (p->data[2] << 8);
p->len += (p->data[1] << 16); p->len += (p->data[1] << 16);
fprintf(stderr, "Tag of len %i\n", p->len); //fprintf(stderr, "Tag of len %i\n", p->len);
if (p->buf < p->len){p->data = (char*)realloc(p->data, p->len);p->buf = p->len;} if (p->buf < p->len){p->data = (char*)realloc(p->data, p->len);p->buf = p->len;}
done = false; done = false;
} }
@ -92,11 +89,9 @@ bool FLV_GetPacket(FLV_Pack *& p, int sock){
if ((p->data[0] == 0x09) && (((p->data[11] & 0xf0) >> 4) == 1)){p->isKeyframe = true;} if ((p->data[0] == 0x09) && (((p->data[11] & 0xf0) >> 4) == 1)){p->isKeyframe = true;}
done = true; done = true;
sofar = 0; sofar = 0;
fcntl(sock, F_SETFL, preflags);
return true; return true;
} }
} }
fcntl(sock, F_SETFL, preflags);
return false; return false;
}//FLV_GetPacket }//FLV_GetPacket