virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

libavutil/random_seed: Ensure that get_generic_seed() spends at least 1/32 sec gathering entropy

Browse Source 
This may fix the failures on windows

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-12-29 00:34:57 +01:00
parent 5dbce5120b
commit 7525517593
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/random_seed.c
View File

@ -68,6 +68,7 @@ static uint32_t get_generic_seed(void)
struct AVSHA *sha = (void*)tmp;
clock_t last_t = 0;
clock_t last_td = 0;
clock_t init_t = 0;
static uint64_t i = 0;
static uint32_t buffer[512] = { 0 };
unsigned char digest[20];
@ -93,10 +94,13 @@ static uint32_t get_generic_seed(void)
} else {
last_td = t - last_t;
buffer[++i & 511] += last_td % 3294638521U;
if ((t - init_t) >= CLOCKS_PER_SEC>>5)
if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8)
break;
}
last_t = t;
if (!init_t)
init_t = t;
}
if(TEST) {