diff options
author | Diego Biurrun <diego@biurrun.de> | 2005-12-22 04:10:11 +0300 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2005-12-22 04:10:11 +0300 |
commit | bb270c0896b39e1ae9277355e3c120ed3feb64a3 (patch) | |
tree | fc2fc2b1216d19acb3879abb6ea5a3b400f43fe4 /tests | |
parent | 50827fcf44f34521df4708cdb633809b56fb9df3 (diff) |
COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
-rw-r--r-- | tests/dsptest.c | 52 | ||||
-rwxr-xr-x | tests/regression.sh | 2 | ||||
-rw-r--r-- | tests/rotozoom.c | 8 | ||||
-rw-r--r-- | tests/videogen.c | 2 |
4 files changed, 32 insertions, 32 deletions
diff --git a/tests/dsptest.c b/tests/dsptest.c index 0b3a397de6..e772e189c7 100644 --- a/tests/dsptest.c +++ b/tests/dsptest.c @@ -102,8 +102,8 @@ static inline long long rdtsc() { long long l; asm volatile( "rdtsc\n\t" - : "=A" (l) - ); + : "=A" (l) + ); return l; } @@ -118,30 +118,30 @@ static test_speed(int step) while (pix->name) { - int i; + int i; uint64_t te, ts; op_pixels_func func = pix->func; - char* im = bu; - - if (pix->mm_flags & mm_flags) - { - printf("%30s... ", pix->name); - fflush(stdout); - ts = rdtsc(); - for(i=0; i<100000; i++){ - func(im, im + 1000, linesize, 16); - im += step; - if (im > bu + 20000) - im = bu; - } - te = rdtsc(); - emms(); - printf("% 9d\n", (int)(te - ts)); - sum += (te - ts) / 100000; - if (pix->mm_flags & PAD) - puts(""); - } - pix++; + char* im = bu; + + if (pix->mm_flags & mm_flags) + { + printf("%30s... ", pix->name); + fflush(stdout); + ts = rdtsc(); + for(i=0; i<100000; i++){ + func(im, im + 1000, linesize, 16); + im += step; + if (im > bu + 20000) + im = bu; + } + te = rdtsc(); + emms(); + printf("% 9d\n", (int)(te - ts)); + sum += (te - ts) / 100000; + if (pix->mm_flags & PAD) + puts(""); + } + pix++; } printf("Total sum: %d\n", sum); @@ -154,8 +154,8 @@ int main(int argc, char* argv[]) if (argc > 1) { // something simple for now - if (argc > 2 && (strcmp("-s", argv[1]) == 0 - || strcmp("-step", argv[1]) == 0)) + if (argc > 2 && (strcmp("-s", argv[1]) == 0 + || strcmp("-step", argv[1]) == 0)) step = atoi(argv[2]); } diff --git a/tests/regression.sh b/tests/regression.sh index 2706cb4f2a..4f1054a42e 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -686,7 +686,7 @@ do_ffmpeg_crc $file -i $file # pix_fmt conversions conversions="yuv420p yuv422p yuv444p yuv422 yuv410p yuv411p yuvj420p \ yuvj422p yuvj444p rgb24 bgr24 rgba32 rgb565 rgb555 gray monow \ - monob pal8" + monob pal8" for pix_fmt in $conversions ; do file=${outfile}libav-${pix_fmt}.yuv do_ffmpeg_nocheck $file -r 1 -t 1 -y -f pgmyuv -i $raw_src \ diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 5df5518f14..5549d6ec2c 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -33,7 +33,7 @@ static int64_t int_sin(int64_t a){ #define SCALEBITS 8 #define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5)) +#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5)) typedef unsigned char UINT8; static void rgb24_to_yuv420p(UINT8 *lum, UINT8 *cb, UINT8 *cr, @@ -241,9 +241,9 @@ void init_demo(const char *filename) { for (i=0;i<H;i++) { fread(line,1,3*W,fichier); for (j=0;j<W;j++) { - tab_r[W*i+j] = line[3*j ]; - tab_g[W*i+j] = line[3*j + 1]; - tab_b[W*i+j] = line[3*j + 2]; + tab_r[W*i+j] = line[3*j ]; + tab_g[W*i+j] = line[3*j + 1]; + tab_b[W*i+j] = line[3*j + 2]; } } fclose(fichier); diff --git a/tests/videogen.c b/tests/videogen.c index edf196fdd6..a6b8ce1674 100644 --- a/tests/videogen.c +++ b/tests/videogen.c @@ -7,7 +7,7 @@ #define SCALEBITS 8 #define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5)) +#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5)) typedef unsigned char uint8_t; static void rgb24_to_yuv420p(uint8_t *lum, uint8_t *cb, uint8_t *cr, |