diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-27 17:34:47 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-27 17:42:55 +0400 |
commit | fcd08262fdbd5ee4cc0d25d32e331d3f049ad8c2 (patch) | |
tree | 139056d0ee0454662a437b89cab42872f9f46c0b /tests | |
parent | 2fd5e70869ccbcdbaa5183d4d763dc6c739b3494 (diff) |
tests and tools: cleanup ffmpeg reference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/codec-regression.sh | 2 | ||||
-rwxr-xr-x | tests/fate-run.sh | 16 | ||||
-rw-r--r-- | tests/fate/mapchan.mak | 2 | ||||
-rw-r--r-- | tests/fate/pcm.mak | 2 | ||||
-rw-r--r-- | tests/fate/vpx.mak | 2 | ||||
-rwxr-xr-x | tests/regression-funcs.sh | 8 |
6 files changed, 16 insertions, 16 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index d1e22becc1..f36fffb4e2 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# automatic regression test for avconv +# automatic regression test for ffmpeg # # #set -x diff --git a/tests/fate-run.sh b/tests/fate-run.sh index cd94d4ab64..a2cf299554 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -73,28 +73,28 @@ probefmt(){ run ffprobe -show_format_entry format_name -print_format default=nw=1:nk=1 -v 0 "$@" } -avconv(){ +ffmpeg(){ run ffmpeg -nostats -threads $threads -thread_type $thread_type -cpuflags $cpuflags "$@" } framecrc(){ - avconv "$@" -f framecrc - + ffmpeg "$@" -f framecrc - } framemd5(){ - avconv "$@" -f framemd5 - + ffmpeg "$@" -f framemd5 - } crc(){ - avconv "$@" -f crc - + ffmpeg "$@" -f crc - } md5(){ - avconv "$@" md5: + ffmpeg "$@" md5: } pcm(){ - avconv "$@" -vn -f s16le - + ffmpeg "$@" -vn -f s16le - } enc_dec_pcm(){ @@ -106,8 +106,8 @@ enc_dec_pcm(){ encfile="${outdir}/${test}.${out_fmt}" cleanfiles=$encfile encfile=$(target_path ${encfile}) - avconv -i $src_file "$@" -f $out_fmt -y ${encfile} || return - avconv -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} - + ffmpeg -i $src_file "$@" -f $out_fmt -y ${encfile} || return + ffmpeg -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} - } regtest(){ diff --git a/tests/fate/mapchan.mak b/tests/fate/mapchan.mak index 19c515c455..119f56613e 100644 --- a/tests/fate/mapchan.mak +++ b/tests/fate/mapchan.mak @@ -1,6 +1,6 @@ FATE_MAPCHAN += fate-mapchan-6ch-extract-2 fate-mapchan-6ch-extract-2: tests/data/asynth-22050-6.wav -fate-mapchan-6ch-extract-2: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.0 -f wav md5: -map_channel 0.0.1 -f wav md5: +fate-mapchan-6ch-extract-2: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.0 -f wav md5: -map_channel 0.0.1 -f wav md5: FATE_MAPCHAN += fate-mapchan-6ch-extract-2-downmix-mono fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index c84de9e47f..e978719dd3 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -27,6 +27,6 @@ fate-dcinema-encode: tests/data/asynth-96000-6.wav fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud -FATE_AVCONV += $(FATE_PCM) +FATE_FFMPEG += $(FATE_PCM) FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM) fate-pcm: $(FATE_PCM) $(FATE_SAMPLES_PCM) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 8168fb2b4a..d3f9cc79ae 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -37,7 +37,7 @@ define FATE_VP8_FULL $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) # FIXME this file contains two frames with identical timestamps, -# so avconv drops one of them +# so ffmpeg drops one of them FATE_VP8 += fate-vp8-sign-bias$(1) fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 827a424582..c4a0f40684 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# common regression functions for avconv +# common regression functions for ffmpeg # # @@ -20,7 +20,7 @@ this="$test.$test_ref" outfile="$datadir/$test_ref/" # various files -avconv="$target_exec ${target_path}/ffmpeg" +ffmpeg="$target_exec ${target_path}/ffmpeg" tiny_psnr="tests/tiny_psnr" raw_src="${target_path}/$raw_src_dir/%02d.pgm" raw_dst="$datadir/$this.out.yuv" @@ -54,8 +54,8 @@ ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint" run_avconv() { - $echov $avconv $AVCONV_OPTS $* - $avconv $AVCONV_OPTS $* + $echov $ffmpeg $AVCONV_OPTS $* + $ffmpeg $AVCONV_OPTS $* } do_avconv() |