Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / random_seed.c

diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c
index a2b388549c6d715e9334bcbb08f44e24ff5d4968..81805e5db0db09abfbbe4352ec8ef8cc96b773df 100644 (file)
--- a/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@ -20,9 +20,10 @@
 
 #include <unistd.h>
 #include <fcntl.h>
+#include <math.h>
+#include <time.h>
 #include "timer.h"
 #include "random_seed.h"
-#include "avutil.h"
 
 static int read_random(uint32_t *dst, const char *file)
 {
@@ -31,37 +32,51 @@ static int read_random(uint32_t *dst, const char *file)
 
     if (fd == -1)
         return -1;
-#if HAVE_FCNTL && defined(O_NONBLOCK)
-    if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK) != -1)
-#endif
-        err = read(fd, dst, sizeof(*dst));
+    err = read(fd, dst, sizeof(*dst));
     close(fd);
 
     return err;
 }
 
-uint32_t av_get_random_seed(void)
+static uint32_t get_generic_seed(void)
 {
-    uint32_t seed;
-    int err;
-
-    err = read_random(&seed, "/dev/urandom");
-    if (err != sizeof(seed))
-        err = read_random(&seed, "/dev/random");
-    if (err == sizeof(seed))
-        return seed;
+    clock_t last_t=0;
+    int bits=0;
+    uint64_t random=0;
+    unsigned i;
+    float s=0.000000000001;
 
+    for(i=0;bits<64;i++){
+        clock_t t= clock();
+        if(last_t && fabs(t-last_t)>s || t==(clock_t)-1){
+            if(i<10000 && s<(1<<24)){
+                s+=s;
+                i=t=0;
+            }else{
+                random= 2*random + (i&1);
+                bits++;
+            }
+        }
+        last_t= t;
+    }
 #ifdef AV_READ_TIME
-    seed = AV_READ_TIME();
+    random ^= AV_READ_TIME();
+#else
+    random ^= clock();
 #endif
-    // XXX what to do ?
-    return seed;
+
+    random += random>>32;
+
+    return random;
 }
 
-#if LIBAVUTIL_VERSION_MAJOR < 51
-attribute_deprecated uint32_t ff_random_get_seed(void);
-uint32_t ff_random_get_seed(void)
+uint32_t av_get_random_seed(void)
 {
-    return av_get_random_seed();
+    uint32_t seed;
+
+    if (read_random(&seed, "/dev/urandom") == sizeof(seed))
+        return seed;
+    if (read_random(&seed, "/dev/random")  == sizeof(seed))
+        return seed;
+    return get_generic_seed();
 }
-#endif