diff options
| -rw-r--r-- | libavcodec/dct-test.c | 17 | ||||
| -rw-r--r-- | libavcodec/fft-test.c | 13 | ||||
| -rw-r--r-- | libavcodec/motion-test.c | 12 | ||||
| -rw-r--r-- | libavutil/des.c | 6 |
4 files changed, 13 insertions, 35 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index d57789395f..4647642080 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -28,13 +28,13 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <sys/time.h> #include <unistd.h> #include <math.h> #include "libavutil/cpu.h" #include "libavutil/common.h" #include "libavutil/lfg.h" +#include "libavutil/time.h" #include "simple_idct.h" #include "aandcttab.h" @@ -143,13 +143,6 @@ static const struct algo idct_tab[] = { #define AANSCALE_BITS 12 -static int64_t gettime(void) -{ - struct timeval tv; - gettimeofday(&tv, NULL); - return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec; -} - #define NB_ITS 20000 #define NB_ITS_SPEED 50000 @@ -312,7 +305,7 @@ static int dct_error(const struct algo *dct, int test, int is_idct, int speed) init_block(block, test, is_idct, &prng); permute(block1, block, dct->format); - ti = gettime(); + ti = av_gettime(); it1 = 0; do { for (it = 0; it < NB_ITS_SPEED; it++) { @@ -320,7 +313,7 @@ static int dct_error(const struct algo *dct, int test, int is_idct, int speed) dct->func(block); } it1 += NB_ITS_SPEED; - ti1 = gettime() - ti; + ti1 = av_gettime() - ti; } while (ti1 < 1000000); emms_c(); @@ -453,7 +446,7 @@ static void idct248_error(const char *name, if (!speed) return; - ti = gettime(); + ti = av_gettime(); it1 = 0; do { for (it = 0; it < NB_ITS_SPEED; it++) { @@ -462,7 +455,7 @@ static void idct248_error(const char *name, idct248_put(img_dest, 8, block); } it1 += NB_ITS_SPEED; - ti1 = gettime() - ti; + ti1 = av_gettime() - ti; } while (ti1 < 1000000); emms_c(); diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index 70c0655ad0..75941a1071 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -27,6 +27,7 @@ #include "libavutil/mathematics.h" #include "libavutil/lfg.h" #include "libavutil/log.h" +#include "libavutil/time.h" #include "fft.h" #if CONFIG_FFT_FLOAT #include "dct.h" @@ -34,7 +35,6 @@ #endif #include <math.h> #include <unistd.h> -#include <sys/time.h> #include <stdlib.h> #include <string.h> @@ -186,13 +186,6 @@ static FFTSample frandom(AVLFG *prng) return (int16_t)av_lfg_get(prng) / 32768.0 * RANGE; } -static int64_t gettime(void) -{ - struct timeval tv; - gettimeofday(&tv,NULL); - return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec; -} - static int check_diff(FFTSample *tab1, FFTSample *tab2, int n, double scale) { int i; @@ -430,7 +423,7 @@ int main(int argc, char **argv) /* we measure during about 1 seconds */ nb_its = 1; for(;;) { - time_start = gettime(); + time_start = av_gettime(); for (it = 0; it < nb_its; it++) { switch (transform) { case TRANSFORM_MDCT: @@ -456,7 +449,7 @@ int main(int argc, char **argv) #endif } } - duration = gettime() - time_start; + duration = av_gettime() - time_start; if (duration >= 1000000) break; nb_its *= 2; diff --git a/libavcodec/motion-test.c b/libavcodec/motion-test.c index fb97f085be..bf63182db1 100644 --- a/libavcodec/motion-test.c +++ b/libavcodec/motion-test.c @@ -32,6 +32,7 @@ #include "config.h" #include "dsputil.h" #include "libavutil/lfg.h" +#include "libavutil/time.h" #undef printf @@ -58,13 +59,6 @@ static void help(void) "test motion implementations\n"); } -static int64_t gettime(void) -{ - struct timeval tv; - gettimeofday(&tv,NULL); - return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec; -} - #define NB_ITS 500 int dummy; @@ -97,7 +91,7 @@ static void test_motion(const char *name, emms_c(); /* speed test */ - ti = gettime(); + ti = av_gettime(); d1 = 0; for(it=0;it<NB_ITS;it++) { for(y=0;y<HEIGHT-17;y++) { @@ -109,7 +103,7 @@ static void test_motion(const char *name, } emms_c(); dummy = d1; /* avoid optimization */ - ti = gettime() - ti; + ti = av_gettime() - ti; printf(" %0.0f kop/s\n", (double)NB_ITS * (WIDTH - 16) * (HEIGHT - 16) / diff --git a/libavutil/des.c b/libavutil/des.c index d65760e575..c7c6f1dbee 100644 --- a/libavutil/des.c +++ b/libavutil/des.c @@ -342,7 +342,7 @@ void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) { #undef srand #include <stdlib.h> #include <stdio.h> -#include <sys/time.h> +#include "libavutil/time.h" static uint64_t rand64(void) { uint64_t r = rand(); r = (r << 32) | rand(); @@ -389,13 +389,11 @@ int main(void) { #ifdef GENTABLES int j; #endif - struct timeval tv; uint64_t key[3]; uint64_t data; uint64_t ct; uint64_t roundkeys[16]; - gettimeofday(&tv, NULL); - srand(tv.tv_sec * 1000 * 1000 + tv.tv_usec); + srand(av_gettime()); key[0] = AV_RB64(test_key); data = AV_RB64(plain); gen_roundkeys(roundkeys, key[0]); |