[Ffmpeg-cvslog] CVS: ffmpeg/tests Makefile, 1.24, 1.25 audiogen.c, 1.2, 1.3 regression.sh, 1.83, 1.84 rotozoom.c, 1.6, 1.7 server-regression.sh, 1.10, 1.11 test.conf, 1.9, 1.10 tiny_psnr.c, 1.7, 1.8 videogen.c, 1.5, 1.6
Diego Biurrun CVS
diego
Sat Dec 17 19:14:42 CET 2005
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/sparc dsputil_vis.c,1.4,1.5
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavutil Makefile, 1.5, 1.6 bswap.h, 1.10, 1.11 common.h, 1.157, 1.158 eval.c, 1.10, 1.11 integer.c, 1.2, 1.3 integer.h, 1.1, 1.2 intfloat_readwrite.c, 1.2, 1.3 mathematics.c, 1.1, 1.2 rational.c, 1.5, 1.6 rational.h, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/ffmpeg/ffmpeg/tests
In directory mail:/var2/tmp/cvs-serv18206/tests
Modified Files:
Makefile audiogen.c regression.sh rotozoom.c
server-regression.sh test.conf tiny_psnr.c videogen.c
Log Message:
COSMETICS: Remove all trailing whitespace.
Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile 18 Jul 2005 17:21:08 -0000 1.24
+++ Makefile 17 Dec 2005 18:14:38 -0000 1.25
@@ -55,7 +55,7 @@
tiny_psnr: tiny_psnr.c
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
-
+
DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \
$(SRC_PATH)/libavcodec/i386/dsputil_mmx_avg.h \
$(SRC_PATH)/libavcodec/i386/dsputil_mmx_rnd.h \
@@ -74,4 +74,4 @@
clean:
rm -rf vsynth1 vsynth2 data
- rm -f asynth1.sw *~ audiogen videogen rotozoom tiny_psnr
+ rm -f asynth1.sw *~ audiogen videogen rotozoom tiny_psnr
Index: audiogen.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/audiogen.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- audiogen.c 15 Oct 2003 01:22:50 -0000 1.2
+++ audiogen.c 17 Dec 2005 18:14:38 -0000 1.3
@@ -93,7 +93,7 @@
"generate a test raw 16 bit stereo audio stream\n", argv[0]);
exit(1);
}
-
+
outfile = fopen(argv[1], "wb");
if (!outfile) {
perror(argv[1]);
@@ -118,7 +118,7 @@
f = 100 + (((10000 - 100) * i) / FE);
a += (f * FRAC_ONE) / FE;
}
-
+
/* 0.5 second of low amplitude white noise */
for(i=0;i<FE / 2;i++) {
v = myrnd(&seed, 20000) - 10000;
@@ -147,7 +147,7 @@
taba[j] += (f * FRAC_ONE) / FE;
}
}
-
+
/* stereo 500 Hz with varying volume */
a = 0;
ampa = 0;
Index: regression.sh
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/regression.sh,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- regression.sh 21 Sep 2005 00:09:02 -0000 1.83
+++ regression.sh 17 Dec 2005 18:14:38 -0000 1.84
@@ -130,7 +130,7 @@
echo $ffmpeg -y -flags +bitexact -dct fastint -idct simple $* -f crc $datadir/ffmpeg.crc
$ffmpeg -y -flags +bitexact -dct fastint -idct simple $* -f crc $datadir/ffmpeg.crc > /tmp/ffmpeg$$ 2>&1
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:|ffmpeg version| configuration| built)" /tmp/ffmpeg$$ || true
- rm -f /tmp/ffmpeg$$
+ rm -f /tmp/ffmpeg$$
echo "$f `cat $datadir/ffmpeg.crc`" >> $logfile
}
@@ -158,7 +158,7 @@
if [ -n "$do_mpeg" ] ; then
# mpeg1 encoding
file=${outfile}mpeg1.mpg
-do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -f mpeg1video $file
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -f mpeg1video $file
# mpeg1 decoding
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
@@ -168,21 +168,21 @@
if [ -n "$do_mpeg2" ] ; then
# mpeg2 encoding
file=${outfile}mpeg2.mpg
-do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video $file
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video $file
# mpeg2 decoding
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
# mpeg2 encoding
file=${outfile}mpeg2.mpg
-do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -idct int -dct int -f mpeg1video $file
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -idct int -dct int -f mpeg1video $file
# mpeg2 decoding
do_ffmpeg $raw_dst -y -idct int -i $file -f rawvideo $raw_dst
# mpeg2 encoding interlaced
file=${outfile}mpeg2i.mpg
-do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video -flags +ildct+ilme $file
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video -flags +ildct+ilme $file
# mpeg2 decoding
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
@@ -192,14 +192,14 @@
if [ -n "$do_mpeg2thread" ] ; then
# mpeg2 encoding interlaced
file=${outfile}mpeg2thread.mpg
-do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 2 $file
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 2 $file
# mpeg2 decoding
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
# mpeg2 encoding interlaced
file=${outfile}mpeg2reuse.mpg
-do_ffmpeg $file -y -sameq -me_threshold 256 -mb_threshold 1024 -i ${outfile}mpeg2thread.mpg -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 $file
+do_ffmpeg $file -y -sameq -me_threshold 256 -mb_threshold 1024 -i ${outfile}mpeg2thread.mpg -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 $file
# mpeg2 decoding
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
@@ -212,7 +212,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec msmpeg4v2 $file
# msmpeg4v2 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -222,7 +222,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec msmpeg4 $file
# msmpeg4 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -232,7 +232,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec wmv1 $file
# wmv1 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -242,7 +242,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec wmv2 $file
# wmv2 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -252,7 +252,7 @@
do_ffmpeg $file -y -qscale 11 -f pgmyuv -i $raw_src -s 352x288 -an -vcodec h261 $file
# h261 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -262,7 +262,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -s 352x288 -an -vcodec h263 $file
# h263 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -272,7 +272,7 @@
do_ffmpeg $file -y -qscale 2 -flags +umv+aiv+aic -f pgmyuv -i $raw_src -s 352x288 -an -vcodec h263p -ps 300 $file
# h263p decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -282,7 +282,7 @@
do_ffmpeg $file -y -flags +mv4 -mbd bits -qscale 10 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
# mpeg4 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -302,7 +302,7 @@
do_ffmpeg $file -y -b 400 -bf 2 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
# mpeg4 rate control decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -312,7 +312,7 @@
do_ffmpeg $file -y -qscale 9 -flags +mv4+part+aic+trell -mbd bits -ps 200 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
# mpeg4 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -322,7 +322,7 @@
do_ffmpeg $file -y -b 500 -flags +mv4+part+aic+trell -mbd bits -ps 200 -bf 2 -f pgmyuv -i $raw_src -an -vcodec mpeg4 -threads 2 $file
# mpeg4 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -332,7 +332,7 @@
do_ffmpeg $file -y -qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
# mpeg4 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -342,7 +342,7 @@
do_ffmpeg $file -y -qscale 7 -flags +mv4+part+aic -mbd rd -ps 250 -error 10 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
# damaged mpeg4 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -352,7 +352,7 @@
do_ffmpeg $file -y -qscale 8 -flags +mv4 -mbd rd -nr 200 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
# mpeg4 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -362,7 +362,7 @@
do_ffmpeg $file -y -qscale 8 -bf 3 -ps 200 -f pgmyuv -i $raw_src -an -vcodec mpeg1video -f mpeg1video $file
# mpeg1 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -372,7 +372,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec mjpeg -pix_fmt yuvj420p $file
# mjpeg decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo -pix_fmt yuv420p $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo -pix_fmt yuv420p $raw_dst
fi
###################################
@@ -382,27 +382,27 @@
do_ffmpeg $file -y -f pgmyuv -i $raw_src -an -vcodec ljpeg -strict -1 $file
# ljpeg decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
if [ -n "$do_rv10" ] ; then
# rv10 encoding
file=${outfile}rv10.rm
-do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an $file
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an $file
# rv10 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
if [ -n "$do_rv20" ] ; then
# rv20 encoding
file=${outfile}rv20.rm
-do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec rv20 -an $file
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec rv20 -an $file
# rv20 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -412,7 +412,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec asv1 $file
# asv1 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -422,7 +422,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec asv2 $file
# asv2 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -432,7 +432,7 @@
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec flv $file
# flv decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -442,7 +442,7 @@
do_ffmpeg $file -y -strict -2 -f pgmyuv -i $raw_src -an -vcodec ffv1 $file
# ffv1 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -452,14 +452,14 @@
do_ffmpeg $file -y -strict -2 -f pgmyuv -i $raw_src -an -vcodec snow -qscale 2 $file
# snow decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
# snow encoding
file=${outfile}snow53.avi
do_ffmpeg $file -y -strict -2 -f pgmyuv -i $raw_src -an -vcodec snow -pred 1 -flags +mv4+qpel $file
# snow decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
@@ -469,7 +469,7 @@
do_ffmpeg $file -dct int -y -f pgmyuv -i $raw_src -s pal -an $file
# dv decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo -s cif $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo -s cif $raw_dst
fi
###################################
@@ -479,17 +479,17 @@
do_ffmpeg $file -y -f pgmyuv -i $raw_src -an -vcodec svq1 -qscale 3 -pix_fmt yuv410p $file
# svq1 decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo -pix_fmt yuv420p $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo -pix_fmt yuv420p $raw_dst
fi
###################################
if [ -n "$do_mp2" ] ; then
# mp2 encoding
file=${outfile}mp2.mp2
-do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src $file
+do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src $file
# mp2 decoding
-do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
+do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
$tiny_psnr $pcm_dst $pcm_ref 2 1924 >> $logfile
fi
@@ -497,50 +497,50 @@
if [ -n "$do_ac3" ] ; then
# ac3 encoding
file=${outfile}ac3.rm
-do_ffmpeg $file -y -ab 128 -ac 2 -f s16le -i $pcm_src -vn $file
+do_ffmpeg $file -y -ab 128 -ac 2 -f s16le -i $pcm_src -vn $file
# ac3 decoding
-#do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
+#do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
fi
###################################
if [ -n "$do_g726" ] ; then
# g726 encoding
file=${outfile}g726.wav
-do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -ab 32 -ac 1 -ar 8000 -acodec g726 $file
+do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -ab 32 -ac 1 -ar 8000 -acodec g726 $file
# g726 decoding
-do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
+do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
fi
###################################
if [ -n "$do_adpcm_ima_wav" ] ; then
# encoding
file=${outfile}adpcm_ima.wav
-do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -acodec adpcm_ima_wav $file
+do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -acodec adpcm_ima_wav $file
# decoding
-do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
+do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
fi
###################################
if [ -n "$do_adpcm_ms" ] ; then
# encoding
file=${outfile}adpcm_ms.wav
-do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -acodec adpcm_ms $file
+do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -acodec adpcm_ms $file
# decoding
-do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
+do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
fi
###################################
if [ -n "$do_adpcm_yam" ] ; then
# encoding
file=${outfile}adpcm_yam.wav
-do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -acodec adpcm_yamaha $file
+do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -acodec adpcm_yamaha $file
# decoding
-do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
+do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
fi
###################################
@@ -700,11 +700,11 @@
if $diff_cmd "$logfile" "$reffile" ; then
- echo
+ echo
echo Regression test succeeded.
exit 0
else
- echo
+ echo
echo Regression test: Error.
exit 1
fi
Index: rotozoom.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/rotozoom.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rotozoom.c 21 Sep 2005 00:09:02 -0000 1.6
+++ rotozoom.c 17 Dec 2005 18:14:38 -0000 1.7
@@ -27,7 +27,7 @@
if(a>=MY_PI*3/2) a -= 2*MY_PI; // -PI/2 .. 3PI/2
if(a>=MY_PI/2 ) a = MY_PI - a; // -PI/2 .. PI/2
-
+
return a - int_pow(a, 3)/6 + int_pow(a, 5)/120 - int_pow(a, 7)/5040;
}
@@ -54,7 +54,7 @@
r1 = r;
g1 = g;
b1 = b;
- lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g +
+ lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g +
FIX(0.11400) * b + ONE_HALF) >> SCALEBITS;
r = p[3];
g = p[4];
@@ -62,7 +62,7 @@
r1 += r;
g1 += g;
b1 += b;
- lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g +
+ lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g +
FIX(0.11400) * b + ONE_HALF) >> SCALEBITS;
p += wrap3;
lum += wrap;
@@ -73,7 +73,7 @@
r1 += r;
g1 += g;
b1 += b;
- lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g +
+ lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g +
FIX(0.11400) * b + ONE_HALF) >> SCALEBITS;
r = p[3];
g = p[4];
@@ -81,12 +81,12 @@
r1 += r;
g1 += g;
b1 += b;
- lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g +
+ lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g +
FIX(0.11400) * b + ONE_HALF) >> SCALEBITS;
-
- cb[0] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 +
+
+ cb[0] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 +
FIX(0.50000) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128;
- cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 -
+ cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 -
FIX(0.08131) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128;
cb++;
@@ -174,7 +174,7 @@
int s11= src[ ((int_x+1)&255) + 256*((int_y+1)&255) ];
int s0= (((1<<16) - frac_x)*s00 + frac_x*s01)>>8;
int s1= (((1<<16) - frac_x)*s10 + frac_x*s11)>>8;
-
+
return (((1<<16) - frac_y)*s0 + frac_y*s1)>>24;
}
@@ -182,14 +182,14 @@
{
const int c = h_cos [teta];
const int s = h_sin [teta];
-
+
const int xi = -(w/2) * c;
const int yi = (w/2) * s;
-
+
const int xj = -(h/2) * s;
const int yj = -(h/2) * c;
int i,j;
-
+
int x,y;
int xprime = xj;
int yprime = yj;
@@ -202,7 +202,7 @@
y = yprime + yi + FIXP*h/2;
yprime += c;
-
+
for ( i=0 ; i<w ; i++ ) {
x += c;
y -= s;
@@ -236,7 +236,7 @@
perror(filename);
exit(1);
}
-
+
fread(line, 1, 15, fichier);
for (i=0;i<H;i++) {
fread(line,1,3*W,fichier);
@@ -283,7 +283,7 @@
gen_image(i, w, h);
pgmyuv_save(buf, w, h, rgb_tab);
}
-
+
free(rgb_tab);
return 0;
}
Index: server-regression.sh
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/server-regression.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- server-regression.sh 13 Nov 2005 00:41:44 -0000 1.10
+++ server-regression.sh 17 Dec 2005 18:14:38 -0000 1.11
@@ -6,7 +6,7 @@
else
diff_cmd="diff"
fi
-
+
# Make sure that the data directory exists
mkdir -p data
@@ -32,7 +32,7 @@
wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=100000 > ff-$file 2>/dev/null &
fi
MDFILES="$MDFILES ff-$file"
- done
+ done
wait
# the status page is always different
md5sum $MDFILES | grep -v html > ffserver.regression
@@ -40,11 +40,11 @@
kill $FFSERVER_PID
wait > /dev/null 2>&1
if $diff_cmd data/ffserver.regression $1 ; then
- echo
+ echo
echo Server regression test succeeded.
exit 0
else
- echo
+ echo
echo Server regression test: Error.
exit 1
fi
Index: test.conf
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/test.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- test.conf 13 Nov 2005 03:00:30 -0000 1.9
+++ test.conf 17 Dec 2005 18:14:38 -0000 1.10
@@ -42,7 +42,7 @@
# You must use 'ffmpeg' to send a live feed to ffserver. In this
# example, you can type:
-#
+#
# ffmpeg http://localhost:8090/feed1.ffm
# ffserver can also do time shifting. It means that it can stream any
Index: tiny_psnr.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/tiny_psnr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tiny_psnr.c 1 Feb 2005 20:32:47 -0000 1.7
+++ tiny_psnr.c 17 Dec 2005 18:14:38 -0000 1.8
@@ -69,7 +69,7 @@
if(a < 1<<16)
return -log16((1LL<<32) / a);
a<<=16;
-
+
for(i=20;i>=0;i--){
int64_t b= exp16_table[i];
if(a<(b<<16)) continue;
@@ -106,12 +106,12 @@
int len= argc<4 ? 1 : atoi(argv[3]);
int64_t max= (1<<(8*len))-1;
int shift= argc<5 ? 0 : atoi(argv[4]);
-
+
if(argc<3){
printf("tiny_psnr <file1> <file2> [<elem size> [<shift>]]\n");
return -1;
}
-
+
f[0]= fopen(argv[1], "rb");
f[1]= fopen(argv[2], "rb");
fseek(f[shift<0], shift < 0 ? -shift : shift, SEEK_SET);
@@ -119,7 +119,7 @@
for(i=0;;){
if( fread(buf[0], SIZE, 1, f[0]) != 1) break;
if( fread(buf[1], SIZE, 1, f[1]) != 1) break;
-
+
for(j=0; j<SIZE; i++,j++){
int64_t a= buf[0][j];
int64_t b= buf[1][j];
@@ -130,16 +130,16 @@
sse += (a-b) * (a-b);
}
}
-
+
if(!i) i=1;
dev= int_sqrt( ((sse/i)*F*F) + (((sse%i)*F*F) + i/2)/i );
if(sse)
psnr= ((2*log16(max<<16) + log16(i) - log16(sse))*284619LL*F + (1<<31)) / (1LL<<32);
else
psnr= 100*F-1; //floating point free infinity :)
-
- printf("stddev:%3d.%02d PSNR:%2d.%02d bytes:%d\n",
- (int)(dev/F), (int)(dev%F),
+
+ printf("stddev:%3d.%02d PSNR:%2d.%02d bytes:%d\n",
+ (int)(dev/F), (int)(dev%F),
(int)(psnr/F), (int)(psnr%F),
i);
return 0;
Index: videogen.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/videogen.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- videogen.c 21 Sep 2005 00:09:02 -0000 1.5
+++ videogen.c 17 Dec 2005 18:14:38 -0000 1.6
@@ -28,7 +28,7 @@
r1 = r;
g1 = g;
b1 = b;
- lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g +
+ lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g +
FIX(0.11400) * b + ONE_HALF) >> SCALEBITS;
r = p[3];
g = p[4];
@@ -36,7 +36,7 @@
r1 += r;
g1 += g;
b1 += b;
- lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g +
+ lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g +
FIX(0.11400) * b + ONE_HALF) >> SCALEBITS;
p += wrap3;
lum += wrap;
@@ -47,7 +47,7 @@
r1 += r;
g1 += g;
b1 += b;
- lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g +
+ lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g +
FIX(0.11400) * b + ONE_HALF) >> SCALEBITS;
r = p[3];
g = p[4];
@@ -55,12 +55,12 @@
r1 += r;
g1 += g;
b1 += b;
- lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g +
+ lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g +
FIX(0.11400) * b + ONE_HALF) >> SCALEBITS;
-
- cb[0] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 +
+
+ cb[0] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 +
FIX(0.50000) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128;
- cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 -
+ cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 -
FIX(0.08131) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128;
cb++;
@@ -221,7 +221,7 @@
put_pixel(x + NOISE_X, y + NOISE_Y, r, g, b);
}
}
-
+
/* then moving objects */
for(i=0;i<NB_OBJS;i++) {
VObj *p = &objs[i];
@@ -272,7 +272,7 @@
gen_image(i, w, h);
pgmyuv_save(buf, w, h, rgb_tab);
}
-
+
free(rgb_tab);
return 0;
}
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/sparc dsputil_vis.c,1.4,1.5
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavutil Makefile, 1.5, 1.6 bswap.h, 1.10, 1.11 common.h, 1.157, 1.158 eval.c, 1.10, 1.11 integer.c, 1.2, 1.3 integer.h, 1.1, 1.2 intfloat_readwrite.c, 1.2, 1.3 mathematics.c, 1.1, 1.2 rational.c, 1.5, 1.6 rational.h, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ffmpeg-cvslog
mailing list