# HG changeset patch # User diego # Date 1237549707 0 # Node ID ae6e96434bec61de61d3fd4fe8a2afdd049666da # Parent e110508543ac30ee5f042875e9079143816c6940 Replace random() usage in test programs by av_lfg_*(). diff -r e110508543ac -r ae6e96434bec aes.c --- a/aes.c Fri Mar 20 11:40:05 2009 +0000 +++ b/aes.c Fri Mar 20 11:48:27 2009 +0000 @@ -192,10 +192,9 @@ } #ifdef TEST +#include "lfg.h" #include "log.h" -#undef random - int main(void){ int i,j; AVAES ae, ad, b; @@ -209,10 +208,12 @@ {0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7, 0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf}, {0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, 0x4e, 0xaa, 0x6f, 0xb4, 0xdb, 0xf7, 0x84, 0x65}}; uint8_t temp[16]; + AVLFG prn; av_aes_init(&ae, "PI=3.141592654..", 128, 0); av_aes_init(&ad, "PI=3.141592654..", 128, 1); av_log_set_level(AV_LOG_DEBUG); + av_lfg_init(&prn, 1); for(i=0; i<2; i++){ av_aes_init(&b, rkey[i], 128, 1); @@ -224,7 +225,7 @@ for(i=0; i<10000; i++){ for(j=0; j<16; j++){ - pt[j]= random(); + pt[j] = av_lfg_get(&prn); } {START_TIMER av_aes_crypt(&ae, temp, pt, 1, NULL, 0); diff -r e110508543ac -r ae6e96434bec pca.c --- a/pca.c Fri Mar 20 11:40:05 2009 +0000 +++ b/pca.c Fri Mar 20 11:48:27 2009 +0000 @@ -164,9 +164,9 @@ #ifdef TEST #undef printf -#undef random #include #include +#include "lfg.h" int main(void){ PCA *pca; @@ -174,15 +174,18 @@ #define LEN 8 double eigenvector[LEN*LEN]; double eigenvalue[LEN]; + AVLFG prn; + + av_lfg_init(&prn, 1); pca= ff_pca_init(LEN); for(i=0; i<9000000; i++){ double v[2*LEN+100]; double sum=0; - int pos= random()%LEN; - int v2= (random()%101) - 50; - v[0]= (random()%101) - 50; + int pos = av_lfg_get(&prn) % LEN; + int v2 = av_lfg_get(&prn) % 101 - 50; + v[0] = av_lfg_get(&prn) % 101 - 50; for(j=1; j<8; j++){ if(j<=pos) v[j]= v[0]; else v[j]= v2; @@ -191,7 +194,7 @@ /* for(j=0; jchild[0]); @@ -179,9 +181,12 @@ int main(void){ int i,k; AVTreeNode *root= NULL, *node=NULL; + AVLFG prn; + + av_lfg_init(&prn, 1); for(i=0; i<10000; i++){ - int j= (random()%86294); + int j = av_lfg_get(&prn) % 86294; if(check(root) > 999){ av_log(NULL, AV_LOG_ERROR, "FATAL error %d\n", i); print(root, 0); @@ -192,7 +197,7 @@ node= av_mallocz(av_tree_node_size); av_tree_insert(&root, (void*)(j+1), cmp, &node); - j= (random()%86294); + j = av_lfg_get(&prn) % 86294; { AVTreeNode *node2=NULL; av_log(NULL, AV_LOG_ERROR, "removing %4d\n", j);