har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests and tools: cleanup ffmpeg reference

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-27 15:34:47 +02:00
parent 2fd5e70869
commit fcd08262fd
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/codec-regression.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# automatic regression test for avconv # automatic regression test for ffmpeg
# #
# #
#set -x #set -x

16
tests/fate-run.sh
View File

@ -73,28 +73,28 @@ probefmt(){
run ffprobe -show_format_entry format_name -print_format default=nw=1:nk=1 -v 0 "$@" 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 "$@" run ffmpeg -nostats -threads $threads -thread_type $thread_type -cpuflags $cpuflags "$@"
} }
framecrc(){ framecrc(){
avconv "$@" -f framecrc - ffmpeg "$@" -f framecrc -
} }
framemd5(){ framemd5(){
avconv "$@" -f framemd5 - ffmpeg "$@" -f framemd5 -
} }
crc(){ crc(){
avconv "$@" -f crc - ffmpeg "$@" -f crc -
} }
md5(){ md5(){
avconv "$@" md5: ffmpeg "$@" md5:
} }
pcm(){ pcm(){
avconv "$@" -vn -f s16le - ffmpeg "$@" -vn -f s16le -
} }
enc_dec_pcm(){ enc_dec_pcm(){
@ -106,8 +106,8 @@ enc_dec_pcm(){
encfile="${outdir}/${test}.${out_fmt}" encfile="${outdir}/${test}.${out_fmt}"
cleanfiles=$encfile cleanfiles=$encfile
encfile=$(target_path ${encfile}) encfile=$(target_path ${encfile})
avconv -i $src_file "$@" -f $out_fmt -y ${encfile} || return ffmpeg -i $src_file "$@" -f $out_fmt -y ${encfile} || return
avconv -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} - ffmpeg -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
} }
regtest(){ regtest(){

2
tests/fate/mapchan.mak
View File

@ -1,6 +1,6 @@
FATE_MAPCHAN += fate-mapchan-6ch-extract-2 FATE_MAPCHAN += fate-mapchan-6ch-extract-2
fate-mapchan-6ch-extract-2: tests/data/asynth-22050-6.wav 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 += fate-mapchan-6ch-extract-2-downmix-mono
fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav

2
tests/fate/pcm.mak
View File

@ -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: SRC = tests/data/asynth-96000-6.wav
fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud 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_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM)
fate-pcm: $(FATE_PCM) $(FATE_SAMPLES_PCM) fate-pcm: $(FATE_PCM) $(FATE_SAMPLES_PCM)

2
tests/fate/vpx.mak
View File

@ -37,7 +37,7 @@ define FATE_VP8_FULL
$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
# FIXME this file contains two frames with identical timestamps, # 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 += fate-vp8-sign-bias$(1)
fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf 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 fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias

8
tests/regression-funcs.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# common regression functions for avconv # common regression functions for ffmpeg
# #
# #
@ -20,7 +20,7 @@ this="$test.$test_ref"
outfile="$datadir/$test_ref/" outfile="$datadir/$test_ref/"
# various files # various files
avconv="$target_exec ${target_path}/ffmpeg" ffmpeg="$target_exec ${target_path}/ffmpeg"
tiny_psnr="tests/tiny_psnr" tiny_psnr="tests/tiny_psnr"
raw_src="${target_path}/$raw_src_dir/%02d.pgm" raw_src="${target_path}/$raw_src_dir/%02d.pgm"
raw_dst="$datadir/$this.out.yuv" raw_dst="$datadir/$this.out.yuv"
@ -54,8 +54,8 @@ ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
run_avconv() run_avconv()
{ {
$echov $avconv $AVCONV_OPTS $* $echov $ffmpeg $AVCONV_OPTS $*
$avconv $AVCONV_OPTS $* $ffmpeg $AVCONV_OPTS $*
} }
do_avconv() do_avconv()

2
tools/ismindex.c
View File

@ -20,7 +20,7 @@
/* /*
* To create a simple file for smooth streaming: * To create a simple file for smooth streaming:
* avconv <normal input/transcoding options> -movflags frag_keyframe foo.ismv * ffmpeg <normal input/transcoding options> -movflags frag_keyframe foo.ismv
* ismindex -n foo foo.ismv * ismindex -n foo foo.ismv
* This step creates foo.ism and foo.ismc that is required by IIS for * This step creates foo.ism and foo.ismc that is required by IIS for
* serving it. * serving it.