Commit c84d5aa7 authored by Michael Niedermayer's avatar Michael Niedermayer

get_generic_seed() for the cases without /dev/random and AV_READ_TIME

Originally committed as revision 24102 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ce1cd1cb
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include "timer.h" #include "timer.h"
#include "time.h"
#include "random_seed.h" #include "random_seed.h"
#include "avutil.h" #include "avutil.h"
...@@ -37,6 +38,38 @@ static int read_random(uint32_t *dst, const char *file) ...@@ -37,6 +38,38 @@ static int read_random(uint32_t *dst, const char *file)
return err; return err;
} }
static uint32_t get_generic_seed(void)
{
int last_t=0;
int bits=0;
uint64_t random=0;
int i;
int s=0;
for(i=0;bits<64;i++){
int t= clock()>>s;
if(last_t && t != last_t){
if(i<10000U && s<24){
s++;
i=t=0;
}else{
random= 2*random + (i&1);
bits++;
}
}
last_t= t;
}
#ifdef AV_READ_TIME
random ^= AV_READ_TIME();
#else
random ^= clock();
#endif
random += random>>32;
return random;
}
uint32_t av_get_random_seed(void) uint32_t av_get_random_seed(void)
{ {
uint32_t seed; uint32_t seed;
...@@ -45,12 +78,7 @@ uint32_t av_get_random_seed(void) ...@@ -45,12 +78,7 @@ uint32_t av_get_random_seed(void)
return seed; return seed;
if (read_random(&seed, "/dev/random") == sizeof(seed)) if (read_random(&seed, "/dev/random") == sizeof(seed))
return seed; return seed;
return get_generic_seed();
#ifdef AV_READ_TIME
seed = AV_READ_TIME();
#endif
// XXX what to do ?
return seed;
} }
#if LIBAVUTIL_VERSION_MAJOR < 51 #if LIBAVUTIL_VERSION_MAJOR < 51
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment