# HG changeset patch # User diego # Date 1237549707 0 # Node ID ea0e5e9a520f6fc4fbf19a5a469c510ba96b5cda # Parent 342e95d4784bd512914e66789066ed464ef982ae Replace random() usage in test programs by av_lfg_*(). diff -r 342e95d4784b -r ea0e5e9a520f cabac.c --- a/cabac.c Fri Mar 20 11:43:58 2009 +0000 +++ b/cabac.c Fri Mar 20 11:48:27 2009 +0000 @@ -179,9 +179,9 @@ } #ifdef TEST -#undef random #define SIZE 10240 +#include "libavutil/lfg.h" #include "avcodec.h" #include "cabac.h" @@ -191,12 +191,14 @@ uint8_t r[9*SIZE]; int i; uint8_t state[10]= {0}; + AVLFG prn; + av_lfg_init(&prn, 1); ff_init_cabac_encoder(&c, b, SIZE); ff_init_cabac_states(&c); for(i=0; i #include "libavutil/common.h" +#include "libavutil/lfg.h" #include "simple_idct.h" #include "aandcttab.h" @@ -41,7 +42,6 @@ #include "x86/idct_xvid.h" #undef printf -#undef random void *fast_memcpy(void *a, const void *b, size_t c){return memcpy(a,b,c);}; @@ -208,8 +208,9 @@ int64_t sysErr[64], sysErrMax=0; int maxout=0; int blockSumErrMax=0, blockSumErr; + AVLFG prn; - srandom(0); + av_lfg_init(&prn, 1); err_inf = 0; err2 = 0; @@ -220,7 +221,7 @@ switch(test){ case 0: for(i=0;i<64;i++) - block1[i] = (random() % 512) -256; + block1[i] = (av_lfg_get(&prn) % 512) -256; if (is_idct){ fdct(block1); @@ -229,12 +230,12 @@ } break; case 1:{ - int num= (random()%10)+1; + int num = av_lfg_get(&prn) % 10 + 1; for(i=0;i #include @@ -31,7 +32,6 @@ #include #undef exit -#undef random /* reference fft */ @@ -131,7 +131,9 @@ float frandom(void) { - return (float)((random() & 0xffff) - 32768) / 32768.0; + AVLFG prn; + av_lfg_init(&prn, 1); + return (float)((av_lfg_get(&prn) & 0xffff) - 32768) / 32768.0; } int64_t gettime(void) diff -r 342e95d4784b -r ea0e5e9a520f motion-test.c --- a/motion-test.c Fri Mar 20 11:43:58 2009 +0000 +++ b/motion-test.c Fri Mar 20 11:48:27 2009 +0000 @@ -30,10 +30,10 @@ #include #include "dsputil.h" +#include "libavutil/lfg.h" #undef exit #undef printf -#undef random #define WIDTH 64 #define HEIGHT 64 @@ -44,9 +44,12 @@ void fill_random(uint8_t *tab, int size) { int i; + AVLFG prn; + + av_lfg_init(&prn, 1); for(i=0;idsp_mask = FF_MM_FORCE; dsputil_init(&cctx, ctx); - for (c = 0; c < 2; c++) { + for (c = 0; c < 1; c++) { int x; ctx->dsp_mask = FF_MM_FORCE | flags[c]; dsputil_init(&mmxctx, ctx); diff -r 342e95d4784b -r ea0e5e9a520f rangecoder.c --- a/rangecoder.c Fri Mar 20 11:43:58 2009 +0000 +++ b/rangecoder.c Fri Mar 20 11:48:27 2009 +0000 @@ -111,13 +111,18 @@ #ifdef TEST #define SIZE 10240 -#undef random + +#include "libavutil/lfg.h" + int main(void){ RangeCoder c; uint8_t b[9*SIZE]; uint8_t r[9*SIZE]; int i; uint8_t state[10]= {0}; + AVLFG prn; + + av_lfg_init(&prn, 1); ff_init_range_encoder(&c, b, SIZE); ff_build_rac_states(&c, 0.05*(1LL<<32), 128+64+32+16); @@ -125,7 +130,7 @@ memset(state, 128, sizeof(state)); for(i=0; i