mirror of
https://github.com/wangyu-/UDPspeeder.git
synced 2025-01-18 22:09:35 +08:00
fec.c is external so leaving it as it is.
Changed log output to 'log_warn'.
This commit is contained in:
parent
c8fb35cf53
commit
3d2ec1bdf2
@ -68,7 +68,7 @@ int delay_manager_t::add(my_time_t delay,const dest_t &dest,char *data,int len)
|
||||
tmp.data=(char *)malloc(delay_data.len+100);
|
||||
if(!tmp.data)
|
||||
{
|
||||
mylog(log_trace, "malloc() returned null in delay_manager_t::add()");
|
||||
mylog(log_warn, "malloc() returned null in delay_manager_t::add()");
|
||||
return -1;
|
||||
}
|
||||
memcpy(tmp.data,data,delay_data.len);
|
||||
|
10
lib/fec.c
10
lib/fec.c
@ -46,7 +46,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
typedef unsigned long u_dword;
|
||||
typedef unsigned long u_long;
|
||||
/*
|
||||
* compatibility stuff
|
||||
*/
|
||||
@ -75,7 +75,7 @@ struct timeval {
|
||||
};
|
||||
#define gettimeofday(x, dummy) { (x)->ticks = clock() ; }
|
||||
#define DIFF_T(a,b) (1+ 1000000*(a.ticks - b.ticks) / CLOCKS_PER_SEC )
|
||||
typedef unsigned long u_dword ;
|
||||
typedef unsigned long u_long ;
|
||||
typedef unsigned short u_short ;
|
||||
#else /* typically, unix systems */
|
||||
#include <sys/time.h>
|
||||
@ -89,12 +89,12 @@ typedef unsigned short u_short ;
|
||||
t = x.tv_usec + 1000000* (x.tv_sec & 0xff ) ; \
|
||||
}
|
||||
#define TOCK(t) \
|
||||
{ u_dword t1 ; TICK(t1) ; \
|
||||
{ u_long t1 ; TICK(t1) ; \
|
||||
if (t1 < t) t = 256000000 + t1 - t ; \
|
||||
else t = t1 - t ; \
|
||||
if (t == 0) t = 1 ;}
|
||||
|
||||
u_dword ticks[10]; /* vars for timekeeping */
|
||||
u_long ticks[10]; /* vars for timekeeping */
|
||||
#else
|
||||
#define DEB(x)
|
||||
#define DDB(x)
|
||||
@ -640,7 +640,7 @@ init_fec()
|
||||
#define FEC_MAGIC 0xFECC0DEC
|
||||
|
||||
struct fec_parms {
|
||||
u_dword magic ;
|
||||
u_long magic ;
|
||||
int k, n ; /* parameters of the code */
|
||||
gf *enc_matrix ;
|
||||
} ;
|
||||
|
Loading…
x
Reference in New Issue
Block a user