[Ffmpeg-cvslog] CVS: ffmpeg/tests dsptest.c, 1.6, 1.7 regression.sh, 1.84, 1.85 rotozoom.c, 1.7, 1.8 videogen.c, 1.6, 1.7
Diego Biurrun CVS
diego
Thu Dec 22 02:10:15 CET 2005
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/ps2 dsputil_mmi.c, 1.11, 1.12 idct_mmi.c, 1.6, 1.7 mmi.h, 1.2, 1.3 mpegvideo_mmi.c, 1.7, 1.8
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavutil avutil.h, 1.1, 1.2 bswap.h, 1.11, 1.12 common.h, 1.158, 1.159
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/ffmpeg/ffmpeg/tests
In directory mail:/var2/tmp/cvs-serv29491/tests
Modified Files:
dsptest.c regression.sh rotozoom.c videogen.c
Log Message:
COSMETICS: tabs --> spaces, some prettyprinting
Index: dsptest.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/dsptest.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dsptest.c 27 May 2002 08:39:04 -0000 1.6
+++ dsptest.c 22 Dec 2005 01:10:11 -0000 1.7
@@ -102,8 +102,8 @@
{
long long l;
asm volatile( "rdtsc\n\t"
- : "=A" (l)
- );
+ : "=A" (l)
+ );
return l;
}
@@ -118,30 +118,30 @@
while (pix->name)
{
- int i;
+ int i;
uint64_t te, ts;
op_pixels_func func = pix->func;
- char* im = bu;
+ 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++;
+ 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 @@
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]);
}
Index: regression.sh
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/regression.sh,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- regression.sh 17 Dec 2005 18:14:38 -0000 1.84
+++ regression.sh 22 Dec 2005 01:10:11 -0000 1.85
@@ -686,7 +686,7 @@
# 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 \
Index: rotozoom.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/rotozoom.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rotozoom.c 17 Dec 2005 18:14:38 -0000 1.7
+++ rotozoom.c 22 Dec 2005 01:10:11 -0000 1.8
@@ -33,7 +33,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;
static void rgb24_to_yuv420p(UINT8 *lum, UINT8 *cb, UINT8 *cr,
@@ -241,9 +241,9 @@
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);
Index: videogen.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/videogen.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- videogen.c 17 Dec 2005 18:14:38 -0000 1.6
+++ videogen.c 22 Dec 2005 01:10:11 -0000 1.7
@@ -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,
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/ps2 dsputil_mmi.c, 1.11, 1.12 idct_mmi.c, 1.6, 1.7 mmi.h, 1.2, 1.3 mpegvideo_mmi.c, 1.7, 1.8
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavutil avutil.h, 1.1, 1.2 bswap.h, 1.11, 1.12 common.h, 1.158, 1.159
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ffmpeg-cvslog
mailing list