RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

using only the fast int dct for regression tests 

Originally committed as revision 884 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2002-08-30 19:49:12 +00:00
parent 3f027ca76c
commit 463678ac8b
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg.c
View File

@ -111,6 +111,7 @@ static int use_hq = 0;
static int use_4mv = 0;
static int do_deinterlace = 0;
static int workaround_bugs = 0;
static int dct_algo = 0;
static int gop_size = 12;
static int intra_only = 0;
@ -1371,6 +1372,11 @@ void opt_workaround_bugs(const char *arg)
workaround_bugs = atoi(arg);
}
void opt_dct_algo(const char *arg)
{
dct_algo = atoi(arg);
}
void opt_frame_rate(const char *arg)
{
frame_rate = (int)(strtod(arg, 0) * FRAME_RATE_BASE);
@ -1794,6 +1800,7 @@ void opt_output_file(const char *filename)
video_enc->b_quant_factor = video_b_qfactor;
video_enc->i_quant_offset = video_i_qoffset;
video_enc->b_quant_offset = video_b_qoffset;
video_enc->dct_algo = dct_algo;
if (do_psnr)
video_enc->get_psnr = 1;
@ -2145,6 +2152,7 @@ const OptionDef options[] = {
{ "vcodec", HAS_ARG | OPT_EXPERT, {(void*)opt_video_codec}, "force video codec", "codec" },
{ "me", HAS_ARG | OPT_EXPERT, {(void*)opt_motion_estimation}, "set motion estimation method",
"method" },
{ "dct_algo", HAS_ARG | OPT_EXPERT, {(void*)opt_dct_algo}, "set dct algo", "algo" },
{ "bf", HAS_ARG | OPT_EXPERT, {(void*)opt_b_frames}, "use 'frames' B frames (only MPEG-4)", "frames" },
{ "hq", OPT_BOOL | OPT_EXPERT, {(void*)&use_hq}, "activate high quality settings" },
{ "4mv", OPT_BOOL | OPT_EXPERT, {(void*)&use_4mv}, "use four motion vector by macroblock (only MPEG-4)" },

4
tests/Makefile
View File

@ -7,11 +7,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/tests
CFLAGS=-O2 -Wall -g
ifeq ($(TARGET_MMX),yes)
REFFILE=$(SRC_PATH)/tests/ffmpeg.regression.ref.mmx
else
REFFILE=$(SRC_PATH)/tests/ffmpeg.regression.ref
endif
LIBAV_REFFILE=$(SRC_PATH)/tests/libav.regression.ref

28
tests/ffmpeg.regression.ref
View File

@ -1,15 +1,15 @@
ffmpeg regression test
6c8b6ee8dd9c34f58908fe501d7dbe1e ./data/a-mpeg1.mpg
59a66b108e8bbd3867c4ee27f4bbe2ca ./data/out.yuv
297793ed0fd5793182a92e63ffd764af ./data/a-msmpeg4.avi
951aa2df4ef4c1eeee3ccc8904de8e48 ./data/out.yuv
abe11239875a32f00fa2910828bba4fb ./data/a-h263.avi
c1f6c8ee7a24d8345deddf1a24ca3756 ./data/out.yuv
19e3dec27e59e62abb588d3d6fccabb5 ./data/a-odivx.avi
145c98a175e760f8ba1997edf15b2964 ./data/out.yuv
f6cce3af628f2bd11e67d864b59bff87 ./data/a-mjpeg.avi
278033451d7a6bfeb8339abbe4228499 ./data/out.yuv
21f8ff9f1daacd9133683bb4ea0f50a4 ./data/a-mp2.mp2
116d1290ba1b4eb98fdee52e423417b1 ./data/out.wav
048b9c3444c788bac6ce5cc3a8f4db00 ./data/a-ac3.rm
ae59a9cf43ee96b3214567ce8a25aa31 ./data/out.wav
5c2366ff8bfeb18603be5716084b95e4 *./data/a-mpeg1.mpg
dfa6154954462ae83ec6e132716e2f26 *./data/out.yuv
f9d4132bfbb3b1d7e8fd906f68985c75 *./data/a-msmpeg4.avi
130f67ce1bcc3270ccd69cdb60f52604 *./data/out.yuv
5e75b82e9a9cffe509b34acdd23f6e21 *./data/a-h263.avi
f409540c3e1705933d14c5ebd943411b *./data/out.yuv
f5a5b2a2afb7a42b02a0d0905620a718 *./data/a-odivx.avi
760a27093d18533d4eceb3a82f1b43e9 *./data/out.yuv
3ad5ac82d92157d2483ab007fb0a8881 *./data/a-mjpeg.avi
e4aa4f907613afd0f2d53eabfc23208e *./data/out.yuv
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav
048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm
ae59a9cf43ee96b3214567ce8a25aa31 *./data/out.wav

8
tests/regression.sh
View File

@ -47,8 +47,8 @@ do_ffmpeg()
{
f="$1"
shift
echo $ffmpeg -bitexact $*
$ffmpeg -bitexact -benchmark $* > $datadir/bench.tmp
echo $ffmpeg -bitexact -dct_algo 1 $*
$ffmpeg -bitexact -dct_algo 1 -benchmark $* > $datadir/bench.tmp
md5sum -b $f >> $logfile
expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp
echo `cat $datadir/bench2.tmp` $f >> $benchfile
@ -58,8 +58,8 @@ do_ffmpeg_crc()
{
f="$1"
shift
echo $ffmpeg -y -bitexact $* -f crc $datadir/ffmpeg.crc
$ffmpeg -y -bitexact $* -f crc $datadir/ffmpeg.crc
echo $ffmpeg -y -bitexact -dct_algo 1 $* -f crc $datadir/ffmpeg.crc
$ffmpeg -y -bitexact -dct_algo 1 $* -f crc $datadir/ffmpeg.crc
echo -n "$f " >> $logfile
cat $datadir/ffmpeg.crc >> $logfile
}