---
tests/Makefile | 6 +-
tests/codec-regression.sh | 96 ++++++++++++++++++++++----------------------
tests/fate-run.sh | 14 +++---
tests/fate.mak | 70 ++++++++++++++++----------------
tests/fate2.mak | 20 +++++-----
tests/lavf-regression.sh | 40 +++++++++---------
tests/lavfi-regression.sh | 6 +-
tests/regression-funcs.sh | 30 +++++++-------
8 files changed, 141 insertions(+), 141 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 7014bf5..124d32d 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,8 +2,8 @@ AREF = fate-acodec-aref
VREF = fate-vsynth1-vref fate-vsynth2-vref
REFS = $(AREF) $(VREF)
-$(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
-$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw
+$(VREF): av$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
+$(AREF): av$(EXESUF) tests/data/asynth1.sw
tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
@mkdir -p tests/vsynth1
@@ -84,7 +84,7 @@ FATE_UTILS = base64 tiny_psnr
fate: $(FATE)
-$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
+$(FATE): av$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
@echo "TEST $(@:fate-%=%)"
$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)"
"$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)'
'$(THREAD_TYPE)'
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index a420c57..9594f89 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# automatic regression test for ffmpeg
+# automatic regression test for av
#
#
#set -x
@@ -13,10 +13,10 @@ eval do_$test=y
# generate reference for quality check
if [ -n "$do_vref" ]; then
-do_ffmpeg $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo
+do_av $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -map 0:v -f rawvideo
fi
if [ -n "$do_aref" ]; then
-do_ffmpeg $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav
+do_av $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav
fi
if [ -n "$do_mpeg" ] ; then
@@ -58,190 +58,190 @@ do_video_decoding
# mpeg2 encoding interlaced
file=${outfile}mpeg2reuse.mpg
-do_ffmpeg $file $DEC_OPTS -me_threshold 256 -i
${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -sameq -me_threshold 256
-mb_threshold 1024 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme
-threads 4
+do_av $file $DEC_OPTS -me_threshold 256 -i
${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -sameq -me_threshold 256
-mb_threshold 1024 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme
-threads 4
do_video_decoding
fi
if [ -n "$do_msmpeg4v2" ] ; then
-do_video_encoding msmpeg4v2.avi "-qscale 10 -an -vcodec msmpeg4v2"
+do_video_encoding msmpeg4v2.avi "-qscale 10 -map 0:v -vcodec msmpeg4v2"
do_video_decoding
fi
if [ -n "$do_msmpeg4" ] ; then
-do_video_encoding msmpeg4.avi "-qscale 10 -an -vcodec msmpeg4"
+do_video_encoding msmpeg4.avi "-qscale 10 -map 0:v -vcodec msmpeg4"
do_video_decoding
fi
if [ -n "$do_wmv1" ] ; then
-do_video_encoding wmv1.avi "-qscale 10 -an -vcodec wmv1"
+do_video_encoding wmv1.avi "-qscale 10 -map 0:v -vcodec wmv1"
do_video_decoding
fi
if [ -n "$do_wmv2" ] ; then
-do_video_encoding wmv2.avi "-qscale 10 -an -vcodec wmv2"
+do_video_encoding wmv2.avi "-qscale 10 -map 0:v -vcodec wmv2"
do_video_decoding
fi
if [ -n "$do_h261" ] ; then
-do_video_encoding h261.avi "-qscale 11 -s 352x288 -an -vcodec h261"
+do_video_encoding h261.avi "-qscale 11 -s 352x288 -map 0:v -vcodec h261"
do_video_decoding
fi
if [ -n "$do_h263" ] ; then
-do_video_encoding h263.avi "-qscale 10 -s 352x288 -an -vcodec h263"
+do_video_encoding h263.avi "-qscale 10 -s 352x288 -map 0:v -vcodec h263"
do_video_decoding
fi
if [ -n "$do_h263p" ] ; then
-do_video_encoding h263p.avi "-qscale 2 -flags +umv+aiv+aic -s 352x288 -an
-vcodec h263p -ps 300"
+do_video_encoding h263p.avi "-qscale 2 -flags +umv+aiv+aic -s 352x288 -map 0:v
-vcodec h263p -ps 300"
do_video_decoding
fi
if [ -n "$do_mpeg4" ] ; then
-do_video_encoding odivx.mp4 "-flags +mv4 -mbd bits -qscale 10 -an -vcodec
mpeg4"
+do_video_encoding odivx.mp4 "-flags +mv4 -mbd bits -qscale 10 -map 0:v -vcodec
mpeg4"
do_video_decoding
fi
if [ -n "$do_huffyuv" ] ; then
-do_video_encoding huffyuv.avi "-an -vcodec huffyuv -pix_fmt yuv422p -sws_flags
neighbor+bitexact"
+do_video_encoding huffyuv.avi "-map 0:v -vcodec huffyuv -pix_fmt yuv422p
-sws_flags neighbor+bitexact"
do_video_decoding "" "-strict -2 -pix_fmt yuv420p -sws_flags neighbor+bitexact"
fi
if [ -n "$do_rc" ] ; then
-do_video_encoding mpeg4-rc.avi "-b 400k -bf 2 -an -vcodec mpeg4"
+do_video_encoding mpeg4-rc.avi "-b 400k -bf 2 -map 0:v -vcodec mpeg4"
do_video_decoding
fi
if [ -n "$do_mpeg4adv" ] ; then
-do_video_encoding mpeg4-adv.avi "-qscale 9 -flags +mv4+part+aic -trellis 1
-mbd bits -ps 200 -an -vcodec mpeg4"
+do_video_encoding mpeg4-adv.avi "-qscale 9 -flags +mv4+part+aic -trellis 1
-mbd bits -ps 200 -map 0:v -vcodec mpeg4"
do_video_decoding
-do_video_encoding mpeg4-qprd.avi "-b 450k -bf 2 -trellis 1 -flags
+mv4+qprd+mv0 -cmp 2 -subcmp 2 -mbd rd -an -vcodec mpeg4"
+do_video_encoding mpeg4-qprd.avi "-b 450k -bf 2 -trellis 1 -flags
+mv4+qprd+mv0 -cmp 2 -subcmp 2 -mbd rd -map 0:v -vcodec mpeg4"
do_video_decoding
-do_video_encoding mpeg4-adap.avi "-b 550k -bf 2 -flags +mv4+mv0 -trellis 1
-cmp 1 -subcmp 2 -mbd rd -scplx_mask 0.3 -an -vcodec mpeg4"
+do_video_encoding mpeg4-adap.avi "-b 550k -bf 2 -flags +mv4+mv0 -trellis 1
-cmp 1 -subcmp 2 -mbd rd -scplx_mask 0.3 -map 0:v -vcodec mpeg4"
do_video_decoding
-do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1
-subcmp 2 -an -vcodec mpeg4"
+do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1
-subcmp 2 -map 0:v -vcodec mpeg4"
do_video_decoding
fi
if [ -n "$do_mpeg4thread" ] ; then
-do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic -trellis 1
-mbd bits -ps 200 -bf 2 -an -vcodec mpeg4 -threads 2"
+do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic -trellis 1
-mbd bits -ps 200 -bf 2 -map 0:v -vcodec mpeg4 -threads 2"
do_video_decoding
fi
if [ -n "$do_error" ] ; then
-do_video_encoding error-mpeg4-adv.avi "-qscale 7 -flags +mv4+part+aic -mbd rd
-ps 250 -error 10 -an -vcodec mpeg4"
+do_video_encoding error-mpeg4-adv.avi "-qscale 7 -flags +mv4+part+aic -mbd rd
-ps 250 -error 10 -map 0:v -vcodec mpeg4"
do_video_decoding
fi
if [ -n "$do_mpeg4nr" ] ; then
-do_video_encoding mpeg4-nr.avi "-qscale 8 -flags +mv4 -mbd rd -nr 200 -an
-vcodec mpeg4"
+do_video_encoding mpeg4-nr.avi "-qscale 8 -flags +mv4 -mbd rd -nr 200 -map 0:v
-vcodec mpeg4"
do_video_decoding
fi
if [ -n "$do_mpeg1b" ] ; then
-do_video_encoding mpeg1b.mpg "-qscale 8 -bf 3 -ps 200 -an -vcodec mpeg1video
-f mpeg1video"
+do_video_encoding mpeg1b.mpg "-qscale 8 -bf 3 -ps 200 -map 0:v -vcodec
mpeg1video -f mpeg1video"
do_video_decoding
fi
if [ -n "$do_mjpeg" ] ; then
-do_video_encoding mjpeg.avi "-qscale 9 -an -vcodec mjpeg -pix_fmt yuvj420p"
+do_video_encoding mjpeg.avi "-qscale 9 -map 0:v -vcodec mjpeg -pix_fmt
yuvj420p"
do_video_decoding "" "-pix_fmt yuv420p"
fi
if [ -n "$do_ljpeg" ] ; then
-do_video_encoding ljpeg.avi "-an -vcodec ljpeg -strict -1"
+do_video_encoding ljpeg.avi "-map 0:v -vcodec ljpeg -strict -1"
do_video_decoding
fi
if [ -n "$do_jpegls" ] ; then
-do_video_encoding jpegls.avi "-an -vcodec jpegls -vtag MJPG -sws_flags
neighbor+full_chroma_int+accurate_rnd+bitexact"
+do_video_encoding jpegls.avi "-map 0:v -vcodec jpegls -vtag MJPG -sws_flags
neighbor+full_chroma_int+accurate_rnd+bitexact"
do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+bitexact"
fi
if [ -n "$do_rv10" ] ; then
-do_video_encoding rv10.rm "-qscale 10 -an"
+do_video_encoding rv10.rm "-qscale 10 -map 0:v"
do_video_decoding
fi
if [ -n "$do_rv20" ] ; then
-do_video_encoding rv20.rm "-qscale 10 -vcodec rv20 -an"
+do_video_encoding rv20.rm "-qscale 10 -vcodec rv20 -map 0:v"
do_video_decoding
fi
if [ -n "$do_asv1" ] ; then
-do_video_encoding asv1.avi "-qscale 10 -an -vcodec asv1"
+do_video_encoding asv1.avi "-qscale 10 -map 0:v -vcodec asv1"
do_video_decoding
fi
if [ -n "$do_asv2" ] ; then
-do_video_encoding asv2.avi "-qscale 10 -an -vcodec asv2"
+do_video_encoding asv2.avi "-qscale 10 -map 0:v -vcodec asv2"
do_video_decoding
fi
if [ -n "$do_flv" ] ; then
-do_video_encoding flv.flv "-qscale 10 -an -vcodec flv"
+do_video_encoding flv.flv "-qscale 10 -map 0:v -vcodec flv"
do_video_decoding
fi
if [ -n "$do_ffv1" ] ; then
-do_video_encoding ffv1.avi "-strict -2 -an -vcodec ffv1"
+do_video_encoding ffv1.avi "-strict -2 -map 0:v -vcodec ffv1"
do_video_decoding
fi
if [ -n "$do_snow" ] ; then
-do_video_encoding snow.avi "-strict -2 -an -vcodec snow -qscale 2 -flags +qpel
-me_method iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64"
+do_video_encoding snow.avi "-strict -2 -map 0:v -vcodec snow -qscale 2 -flags
+qpel -me_method iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64"
do_video_decoding "" "-s 352x288"
fi
if [ -n "$do_snowll" ] ; then
-do_video_encoding snow53.avi "-strict -2 -an -vcodec snow -qscale .001 -pred 1
-flags +mv4+qpel"
+do_video_encoding snow53.avi "-strict -2 -map 0:v -vcodec snow -qscale .001
-pred 1 -flags +mv4+qpel"
do_video_decoding
fi
if [ -n "$do_dv" ] ; then
-do_video_encoding dv.dv "-dct int -s pal -an"
+do_video_encoding dv.dv "-dct int -s pal -map 0:v"
do_video_decoding "" "-s cif"
-do_video_encoding dv411.dv "-dct int -s pal -an -pix_fmt yuv411p -sws_flags
area+accurate_rnd+bitexact"
+do_video_encoding dv411.dv "-dct int -s pal -map 0:v -pix_fmt yuv411p
-sws_flags area+accurate_rnd+bitexact"
do_video_decoding "" "-s cif -sws_flags area+accurate_rnd+bitexact"
fi
if [ -n "$do_dv50" ] ; then
-do_video_encoding dv50.dv "-dct int -s pal -pix_fmt yuv422p -an -sws_flags
neighbor+bitexact"
+do_video_encoding dv50.dv "-dct int -s pal -pix_fmt yuv422p -map 0:v
-sws_flags neighbor+bitexact"
do_video_decoding "" "-s cif -pix_fmt yuv420p -sws_flags neighbor+bitexact"
fi
if [ -n "$do_dnxhd_1080i" ] ; then
# FIXME: interlaced raw DNxHD decoding is broken
-do_video_encoding dnxhd-1080i.mov "-vcodec dnxhd -flags +ildct -s hd1080 -b
120M -pix_fmt yuv422p -vframes 5 -an"
+do_video_encoding dnxhd-1080i.mov "-vcodec dnxhd -flags +ildct -s hd1080 -b
120M -pix_fmt yuv422p -vframes 5 -map 0:v"
do_video_decoding "" "-s cif -pix_fmt yuv420p"
fi
if [ -n "$do_dnxhd_720p" ] ; then
-do_video_encoding dnxhd-720p.dnxhd "-s hd720 -b 90M -pix_fmt yuv422p -vframes
5 -an"
+do_video_encoding dnxhd-720p.dnxhd "-s hd720 -b 90M -pix_fmt yuv422p -vframes
5 -map 0:v"
do_video_decoding "" "-s cif -pix_fmt yuv420p"
fi
if [ -n "$do_dnxhd_720p_rd" ] ; then
-do_video_encoding dnxhd-720p-rd.dnxhd "-threads 4 -mbd rd -s hd720 -b 90M
-pix_fmt yuv422p -vframes 5 -an"
+do_video_encoding dnxhd-720p-rd.dnxhd "-threads 4 -mbd rd -s hd720 -b 90M
-pix_fmt yuv422p -vframes 5 -map 0:v"
do_video_decoding "" "-s cif -pix_fmt yuv420p"
fi
if [ -n "$do_dnxhd_720p_10bit" ] ; then
-do_video_encoding dnxhd-720p-10bit.dnxhd "-s hd720 -b 90M -pix_fmt yuv422p10
-vframes 5 -an"
+do_video_encoding dnxhd-720p-10bit.dnxhd "-s hd720 -b 90M -pix_fmt yuv422p10
-vframes 5 -map 0:v"
do_video_decoding "" "-s cif -pix_fmt yuv420p"
fi
if [ -n "$do_svq1" ] ; then
-do_video_encoding svq1.mov "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410p"
+do_video_encoding svq1.mov "-map 0:v -vcodec svq1 -qscale 3 -pix_fmt yuv410p"
do_video_decoding "" "-pix_fmt yuv420p"
fi
if [ -n "$do_flashsv" ] ; then
-do_video_encoding flashsv.flv "-an -vcodec flashsv -sws_flags
neighbor+full_chroma_int+accurate_rnd+bitexact"
+do_video_encoding flashsv.flv "-map 0:v -vcodec flashsv -sws_flags
neighbor+full_chroma_int+accurate_rnd+bitexact"
do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact"
fi
@@ -251,17 +251,17 @@ do_video_decoding "" "-pix_fmt yuv420p"
fi
if [ -n "$do_qtrle" ] ; then
-do_video_encoding qtrle.mov "-an -vcodec qtrle"
+do_video_encoding qtrle.mov "-map 0:v -vcodec qtrle"
do_video_decoding "" "-pix_fmt yuv420p"
fi
if [ -n "$do_rgb" ] ; then
-do_video_encoding rgb.avi "-an -vcodec rawvideo -pix_fmt bgr24"
+do_video_encoding rgb.avi "-map 0:v -vcodec rawvideo -pix_fmt bgr24"
do_video_decoding "" "-pix_fmt yuv420p"
fi
if [ -n "$do_yuv" ] ; then
-do_video_encoding yuv.avi "-an -vcodec rawvideo -pix_fmt yuv420p"
+do_video_encoding yuv.avi "-map 0:v -vcodec rawvideo -pix_fmt yuv420p"
do_video_decoding "" "-pix_fmt yuv420p"
fi
@@ -272,7 +272,7 @@ $tiny_psnr $pcm_dst $pcm_ref 2 1924
fi
if [ -n "$do_ac3_fixed" ] ; then
-do_audio_encoding ac3.rm "-vn -acodec ac3_fixed"
+do_audio_encoding ac3.rm "-map 0:a -acodec ac3_fixed"
# binaries configured with --disable-sse decode ac3 differently
#do_audio_decoding
#$tiny_psnr $pcm_dst $pcm_ref 2 1024
@@ -320,12 +320,12 @@ fi
if [ -n "$do_wmav1" ] ; then
do_audio_encoding wmav1.asf "-acodec wmav1"
-do_ffmpeg_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav
+do_av_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav
$tiny_psnr $pcm_dst $pcm_ref 2 8192
fi
if [ -n "$do_wmav2" ] ; then
do_audio_encoding wmav2.asf "-acodec wmav2"
-do_ffmpeg_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav
+do_av_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav
$tiny_psnr $pcm_dst $pcm_ref 2 8192
fi
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 4121035..0067f38 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -49,28 +49,28 @@ run(){
$target_exec $target_path/"$@"
}
-ffmpeg(){
- run ffmpeg -v 0 -threads $threads -thread_type $thread_type "$@"
+av(){
+ run av -v 0 -threads $threads -thread_type $thread_type "$@"
}
framecrc(){
- ffmpeg "$@" -f framecrc -
+ av "$@" -f framecrc -
}
framemd5(){
- ffmpeg "$@" -f framemd5 -
+ av "$@" -f framemd5 -
}
crc(){
- ffmpeg "$@" -f crc -
+ av "$@" -f crc -
}
md5(){
- ffmpeg "$@" md5:
+ av "$@" md5:
}
pcm(){
- ffmpeg "$@" -vn -f s16le -
+ av "$@" -map 0:a -f s16le -
}
regtest(){
diff --git a/tests/fate.mak b/tests/fate.mak
index 0e33311..633ac09 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -1,7 +1,7 @@
FATE_TESTS += fate-4xm-1
-fate-4xm-1: CMD = framecrc -i $(SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an
+fate-4xm-1: CMD = framecrc -i $(SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -map
0:v
FATE_TESTS += fate-4xm-2
-fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an
+fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -map
0:v
FATE_TESTS += fate-8bps
fate-8bps: CMD = framecrc -i $(SAMPLES)/8bps/full9iron-partial.mov -pix_fmt
rgb24
FATE_TESTS += fate-aac-demux
@@ -9,27 +9,27 @@ fate-aac-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac
-acodec copy
FATE_TESTS += fate-aasc
fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24
FATE_TESTS += fate-adpcm-ea-r2
-fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc -vn
+fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc -map 0:a
FATE_TESTS += fate-adpcm-ea-r3
-fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn
+fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -map 0:a
FATE_TESTS += fate-aea-demux
fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy
FATE_TESTS += fate-alg-mm
-fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24
+fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -map 0:v -pix_fmt
rgb24
FATE_TESTS += fate-amv
fate-amv: CMD = framecrc -idct simple -i
$(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10
FATE_TESTS += fate-armovie-escape124
fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt
rgb24
FATE_TESTS += fate-auravision
-fate-auravision: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an
+fate-auravision: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -map 0:v
FATE_TESTS += fate-auravision-v2
-fate-auravision-v2: CMD = framecrc -i
$(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
+fate-auravision-v2: CMD = framecrc -i
$(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -map 0:v
FATE_TESTS += fate-bethsoft-vid
fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID
-vsync 0 -t 5 -pix_fmt rgb24
FATE_TESTS += fate-bfi
fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
FATE_TESTS += fate-bink-demux
-fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
+fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -map 0:a
-acodec copy
FATE_TESTS += fate-bink-demux-video
fate-bink-demux-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
FATE_TESTS += fate-caf
@@ -49,15 +49,15 @@ fate-creative-adpcm-8-2bit: CMD = md5 -i
$(SAMPLES)/creative/BBC_2BIT.VOC -f s1
FATE_TESTS += fate-creative-adpcm-8-4bit
fate-creative-adpcm-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f
s16le
FATE_TESTS += fate-creatureshock-avs
-fate-creatureshock-avs: CMD = framecrc -i
$(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
+fate-creatureshock-avs: CMD = framecrc -i
$(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 -map 0:v -map 0:a
FATE_TESTS += fate-cryo-apc
fate-cryo-apc: CMD = md5 -i $(SAMPLES)/cryo-apc/cine007.APC -f s16le
FATE_TESTS += fate-cscd
-fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -vsync 0
-pix_fmt rgb24
+fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -map 0:v -vsync
0 -pix_fmt rgb24
FATE_TESTS += fate-cvid
-fate-cvid: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an
+fate-cvid: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi
-map 0:v
FATE_TESTS += fate-cvid-palette
-fate-cvid-palette: CMD = framecrc -i
$(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an
+fate-cvid-palette: CMD = framecrc -i
$(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -map 0:v
FATE_TESTS += fate-cyberia-c93
fate-cyberia-c93: CMD = framecrc -i $(SAMPLES)/cyberia-c93/intro1.c93 -t 3
-pix_fmt rgb24
FATE_TESTS += fate-cyuv
@@ -87,7 +87,7 @@ fate-ea-mad-adpcm-ea-r1: CMD = framecrc -i
$(SAMPLES)/ea-mad/NFS6LogoE.mad
FATE_TESTS += fate-ea-mad-pcm-planar
fate-ea-mad-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad
FATE_TESTS += fate-ea-tgq
-fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an
+fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -map 0:v
FATE_TESTS += fate-ea-tgv-ima-ea-eacs
fate-ea-tgv-ima-ea-eacs: CMD = framecrc -i
$(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24
FATE_TESTS += fate-ea-tgv-ima-ea-sead
@@ -111,7 +111,7 @@ fate-flic-magiccarpet: CMD = framecrc -i
$(SAMPLES)/fli/intel.dat -pix_fmt rgb2
FATE_TESTS += fate-fraps-v0
fate-fraps-v0: CMD = framecrc -i
$(SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi
FATE_TESTS += fate-fraps-v1
-fate-fraps-v1: CMD = framecrc -i $(SAMPLES)/fraps/sample-v1.avi -an
+fate-fraps-v1: CMD = framecrc -i $(SAMPLES)/fraps/sample-v1.avi -map 0:v
FATE_TESTS += fate-fraps-v2
fate-fraps-v2: CMD = framecrc -i $(SAMPLES)/fraps/test3-nosound-partial.avi
FATE_TESTS += fate-fraps-v3
@@ -143,7 +143,7 @@ fate-indeo2: CMD = framecrc -i $(SAMPLES)/rt21/VPAR0026.AVI
FATE_TESTS += fate-indeo3
fate-indeo3: CMD = framecrc -i $(SAMPLES)/iv32/cubes.mov
FATE_TESTS += fate-indeo5
-fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an
+fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi
-map 0:v
FATE_TESTS += fate-interplay-mve-16bit
fate-interplay-mve-16bit: CMD = framecrc -i
$(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24
FATE_TESTS += fate-interplay-mve-8bit
@@ -151,7 +151,7 @@ fate-interplay-mve-8bit: CMD = framecrc -i
$(SAMPLES)/interplay-mve/interplay-l
FATE_TESTS += fate-iv8-demux
fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vsync 0
-vcodec copy
FATE_TESTS += fate-kmvc
-fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
+fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -map 0:v -t 3 -pix_fmt
rgb24
FATE_TESTS += fate-lmlm4-demux
fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t
3 -acodec copy -vcodec copy
FATE_TESTS += fate-loco-rgb
@@ -175,7 +175,7 @@ fate-maxis-xa: CMD = md5 -i $(SAMPLES)/maxis-xa/SC2KBUG.XA
-f s16le
FATE_TESTS += fate-mimic
fate-mimic: CMD = framecrc -idct simple -i
$(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam -vsync 0
FATE_TESTS += fate-motionpixels
-fate-motionpixels: CMD = framecrc -i
$(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24
+fate-motionpixels: CMD = framecrc -i
$(SAMPLES)/motion-pixels/INTRO-partial.MVI -map 0:v -pix_fmt rgb24
FATE_TESTS += fate-mpc7-demux
fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy
FATE_TESTS += fate-mpc8-demux
@@ -201,13 +201,13 @@ fate-nuv: CMD = framecrc -idct simple -i
$(SAMPLES)/nuv/Today.nuv
FATE_TESTS += fate-oma-demux
fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec
copy
FATE_TESTS += fate-pcm_dvd
-fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
+fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -map
0:a
FATE_TESTS += fate-psx-str
fate-psx-str: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str
FATE_TESTS += fate-psx-str-v3-mdec
-fate-psx-str-v3-mdec: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -an
+fate-psx-str-v3-mdec: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str
-map 0:v
FATE_TESTS += fate-psx-str-v3-adpcm_xa
-fate-psx-str-v3-adpcm_xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str
-vn
+fate-psx-str-v3-adpcm_xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str
-map 0:a
FATE_TESTS += fate-ptx
fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
FATE_TESTS += fate-pva-demux
@@ -215,7 +215,7 @@ fate-pva-demux: CMD = framecrc -idct simple -i
$(SAMPLES)/pva/PVA_test-partial.
FATE_TESTS += fate-qcp-demux
fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy
FATE_TESTS += fate-qpeg
-fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
+fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -map 0:v -pix_fmt rgb24
FATE_TESTS += fate-qt-alaw-mono
fate-qt-alaw-mono: CMD = md5 -i
$(SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le
FATE_TESTS += fate-qt-alaw-stereo
@@ -259,19 +259,19 @@ fate-qtrle-2bit: CMD = framecrc -i
$(SAMPLES)/qtrle/Animation-4Greys.mov -pix_f
FATE_TESTS += fate-qtrle-32bit
fate-qtrle-32bit: CMD = framecrc -i
$(SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24
FATE_TESTS += fate-qtrle-4bit
-fate-qtrle-4bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-16Greys.mov
-pix_fmt rgb24 -an
+fate-qtrle-4bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-16Greys.mov
-pix_fmt rgb24 -map 0:v
FATE_TESTS += fate-qtrle-8bit
-fate-qtrle-8bit: CMD = framecrc -i $(SAMPLES)/qtrle/criticalpath-credits.mov
-vsync 0 -pix_fmt rgb24 -an
+fate-qtrle-8bit: CMD = framecrc -i $(SAMPLES)/qtrle/criticalpath-credits.mov
-vsync 0 -pix_fmt rgb24 -map 0:v
FATE_TESTS += fate-quickdraw
fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt
rgb24
FATE_TESTS += fate-real-14_4
fate-real-14_4: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le
FATE_TESTS += fate-real-rv40
-fate-real-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an
+fate-real-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10
-map 0:v
FATE_TESTS += fate-redcode-demux
fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec
copy -acodec copy
FATE_TESTS += fate-rl2
-fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an
-vsync 0
+fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -map
0:v -vsync 0
FATE_TESTS += fate-rpza
fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24
FATE_TESTS += fate-sierra-audio
@@ -301,9 +301,9 @@ fate-sunraster-8bit-raw: CMD = framecrc -i
$(SAMPLES)/sunraster/lena-8bit-raw.s
FATE_TESTS += fate-sunraster-8bit-rle
fate-sunraster-8bit-rle: CMD = framecrc -i
$(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24
FATE_TESTS += fate-svq1
-fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10
+fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -map 0:v
-t 10
FATE_TESTS += fate-svq3
-fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t
6 -an
+fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t
6 -map 0:v
FATE_TESTS += fate-thp-mjpeg-adpcm
fate-thp-mjpeg-adpcm: CMD = framecrc -idct simple -i
$(SAMPLES)/thp/pikmin2-opening1-partial.thp
FATE_TESTS += fate-tiertex-seq
@@ -317,15 +317,15 @@ fate-truemotion1-24: CMD = framecrc -i
$(SAMPLES)/duck/sonic3dblast_intro-partia
FATE_TESTS += fate-tscc-15bit
fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15
-pix_fmt rgb24
FATE_TESTS += fate-tscc-32bit
-fate-tscc-32bit: CMD = framecrc -i
$(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
+fate-tscc-32bit: CMD = framecrc -i
$(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -map 0:v
FATE_TESTS += fate-ulti
-fate-ulti: CMD = framecrc -i $(SAMPLES)/ulti/hit12w.avi -an
+fate-ulti: CMD = framecrc -i $(SAMPLES)/ulti/hit12w.avi -map 0:v
FATE_TESTS += fate-v210
-fate-v210: CMD = framecrc -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt
yuv422p16be -an
+fate-v210: CMD = framecrc -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt
yuv422p16be -map 0:v
FATE_TESTS += fate-vc1
fate-vc1: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
FATE_TESTS += fate-vcr1
-fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an
+fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -map 0:v
FATE_TESTS += fate-video-xl
fate-video-xl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi
FATE_TESTS += fate-vmnc-16bit
@@ -333,7 +333,7 @@ fate-vmnc-16bit: CMD = framecrc -i
$(SAMPLES)/VMnc/test.avi -pix_fmt rgb24
FATE_TESTS += fate-vmnc-32bit
fate-vmnc-32bit: CMD = framecrc -i
$(SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24
FATE_TESTS += fate-vp5
-fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
+fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -map 0:v
FATE_TESTS += fate-vp6a
fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
FATE_TESTS += fate-vp6f
@@ -349,9 +349,9 @@ fate-wc3movie-xan: CMD = framecrc -i
$(SAMPLES)/wc3movie/SC_32-part.MVE -pix_fm
FATE_TESTS += fate-westwood-aud
fate-westwood-aud: CMD = md5 -i $(SAMPLES)/westwood-aud/excellent.aud -f s16le
FATE_TESTS += fate-wnv1
-fate-wnv1: CMD = framecrc -i $(SAMPLES)/wnv1/wnv1-codec.avi -an
+fate-wnv1: CMD = framecrc -i $(SAMPLES)/wnv1/wnv1-codec.avi -map 0:v
FATE_TESTS += fate-xan-dpcm
-fate-xan-dpcm: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le
+fate-xan-dpcm: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -map 0:a -f s16le
FATE_TESTS += fate-zlib
fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi
FATE_TESTS += fate-zmbv-15bit
@@ -361,4 +361,4 @@ fate-zmbv-16bit: CMD = framecrc -i
$(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb2
FATE_TESTS += fate-zmbv-32bit
fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt
rgb24 -t 25
FATE_TESTS += fate-zmbv-8bit
-fate-zmbv-8bit: CMD = framecrc -i $(SAMPLES)/zmbv/wc2_001-partial.avi -an
-pix_fmt rgb24
+fate-zmbv-8bit: CMD = framecrc -i $(SAMPLES)/zmbv/wc2_001-partial.avi -map
0:v -pix_fmt rgb24
diff --git a/tests/fate2.mak b/tests/fate2.mak
index a743f0c..42ede91 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -35,7 +35,7 @@ fate-ra-cook: CMP = oneoff
fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm
FATE_TESTS += fate-mpeg2-field-enc
-fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct
simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
+fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct
simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -map 0:v
FATE_TESTS += fate-qcelp
fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP
@@ -54,10 +54,10 @@ fate-imc: CMP = oneoff
fate-imc: REF = $(SAMPLES)/imc/imc.pcm
FATE_TESTS += fate-yop
-fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an
+fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -map 0:v
FATE_TESTS += fate-pictor
-fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -an
+fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -map
0:v
FATE_TESTS += fate-dts
fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
@@ -134,7 +134,7 @@ FATE_TESTS += fate-g722dec-1
fate-g722dec-1: CMD = framecrc -ar 16000 -i
$(SAMPLES)/g722/conf-adminmenu-162.g722
FATE_TESTS += fate-msmpeg4v1
-fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i
$(SAMPLES)/msmpeg4v1/mpg4.avi -an
+fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i
$(SAMPLES)/msmpeg4v1/mpg4.avi -map 0:v
FATE_TESTS += fate-wmavoice-7k
fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma
@@ -169,10 +169,10 @@ fate-ansi: CMD = framecrc -chars_per_frame 44100 -i
$(SAMPLES)/ansi/TRE-IOM5.ANS
FATE_TESTS += fate-wmv8-drm
# discard last packet to avoid fails due to overread of VC-1 decoder
-fate-wmv8-drm: CMD = framecrc -cryptokey
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an
-vframes 162
+fate-wmv8-drm: CMD = framecrc -cryptokey
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -map
0:v -vframes 162
FATE_TESTS += fate-wmv8-drm-nodec
-fate-wmv8-drm-nodec: CMD = framecrc -cryptokey
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec
copy -vcodec copy
+fate-wmv8-drm-nodec: CMD = framecrc -cryptokey
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -map
0:v -map 0:a -acodec copy -vcodec copy
FATE_TESTS += fate-binkaudio-dct
fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik
@@ -187,10 +187,10 @@ fate-binkaudio-rdft: REF =
$(SAMPLES)/bink/binkaudio_rdft.pcm
fate-binkaudio-rdft: FUZZ = 2
FATE_TESTS += fate-txd-pal8
-fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
+fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -map
0:v
FATE_TESTS += fate-txd-16bpp
-fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an
+fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -map
0:v
FATE_TESTS += fate-vp3
fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
@@ -208,10 +208,10 @@ FATE_TESTS += fate-dxa-scummvm
fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
FATE_TESTS += fate-mjpegb
-fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i
$(SAMPLES)/mjpegb/mjpegb_part.mov -an
+fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i
$(SAMPLES)/mjpegb/mjpegb_part.mov -map 0:v
FATE_TESTS += fate-rv30
-fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i
$(SAMPLES)/real/rv30.rm -an
+fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i
$(SAMPLES)/real/rv30.rm -map 0:v
FATE_TESTS += fate-musepack7
fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 38a190c..ddcb602 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -14,15 +14,15 @@ eval do_$test=y
do_lavf()
{
file=${outfile}lavf.$1
- do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS
-ar 44100 -f s16le -i $pcm_src $ENC_OPTS -ab 64k -t 1 -qscale 10 $2
- do_ffmpeg_crc $file $DEC_OPTS -i $target_path/$file $3
+ do_av $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar
44100 -f s16le -i $pcm_src $ENC_OPTS -ab 64k -t 1 -qscale 10 $2
+ do_av_crc $file $DEC_OPTS -i $target_path/$file $3
}
do_streamed_images()
{
file=${outfile}${1}pipe.$1
- do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src -f
image2pipe $ENC_OPTS -t 1 -qscale 10
- do_ffmpeg_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
+ do_av $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src -f image2pipe
$ENC_OPTS -t 1 -qscale 10
+ do_av_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
}
do_image_formats()
@@ -30,17 +30,17 @@ do_image_formats()
outfile="$datadir/images/$1/"
mkdir -p "$outfile"
file=${outfile}%02d.$1
- run_ffmpeg $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS $3
-t 0.5 -y -qscale 10 $target_path/$file
+ run_av $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS $3 -t
0.5 -y -qscale 10 $target_path/$file
do_md5sum ${outfile}02.$1
- do_ffmpeg_crc $file $DEC_OPTS $3 -i $target_path/$file
+ do_av_crc $file $DEC_OPTS $3 -i $target_path/$file
wc -c ${outfile}02.$1
}
do_audio_only()
{
file=${outfile}lavf.$1
- do_ffmpeg $file $DEC_OPTS $2 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1
-qscale 10 $3
- do_ffmpeg_crc $file $DEC_OPTS $4 -i $target_path/$file
+ do_av $file $DEC_OPTS $2 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1
-qscale 10 $3
+ do_av_crc $file $DEC_OPTS $4 -i $target_path/$file
}
if [ -n "$do_avi" ] ; then
@@ -53,9 +53,9 @@ fi
if [ -n "$do_rm" ] ; then
file=${outfile}lavf.rm
-do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar
44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -ab 64k
+do_av $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100
-f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -ab 64k
# broken
-#do_ffmpeg_crc $file -i $target_path/$file
+#do_av_crc $file -i $target_path/$file
fi
if [ -n "$do_mpg" ] ; then
@@ -75,7 +75,7 @@ do_lavf ts
fi
if [ -n "$do_swf" ] ; then
-do_lavf swf -an
+do_lavf swf "-map 0:v"
fi
if [ -n "$do_ffm" ] ; then
@@ -83,7 +83,7 @@ do_lavf ffm
fi
if [ -n "$do_flv_fmt" ] ; then
-do_lavf flv -an
+do_lavf flv "-map 0:v"
fi
if [ -n "$do_mov" ] ; then
@@ -110,8 +110,8 @@ fi
# streamed images
# mjpeg
#file=${outfile}lavf.mjpeg
-#do_ffmpeg $file -t 1 -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src
-#do_ffmpeg_crc $file -i $target_path/$file
+#do_av $file -t 1 -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src
+#do_av_crc $file -i $target_path/$file
if [ -n "$do_pbmpipe" ] ; then
do_streamed_images pbm
@@ -127,14 +127,14 @@ fi
if [ -n "$do_gif" ] ; then
file=${outfile}lavf.gif
-do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1
-qscale 10 -pix_fmt rgb24
-do_ffmpeg_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
+do_av $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1
-qscale 10 -pix_fmt rgb24
+do_av_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
fi
if [ -n "$do_yuv4mpeg" ] ; then
file=${outfile}lavf.y4m
-do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1
-qscale 10
-#do_ffmpeg_crc $file -i $target_path/$file
+do_av $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1
-qscale 10
+#do_av_crc $file -i $target_path/$file
fi
# image formats
@@ -227,9 +227,9 @@ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p
yuv411p yuvj420p \
monob yuv440p yuvj440p"
for pix_fmt in $conversions ; do
file=${outfile}${pix_fmt}.yuv
- run_ffmpeg $DEC_OPTS -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \
+ run_av $DEC_OPTS -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt
$target_path/$raw_dst
- do_ffmpeg $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i
$target_path/$raw_dst \
+ do_av $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i
$target_path/$raw_dst \
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
done
fi
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index 8942756..d749298 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -16,7 +16,7 @@ do_video_filter() {
filters=$2
shift 2
printf '%-20s' $label
- run_ffmpeg $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
+ run_av $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
$ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
}
@@ -49,7 +49,7 @@ do_lavfi_pixfmts(){
out_fmts=${outfile}${1}_out_fmts
# exclude pixel formats which are not supported as input
- $ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut
-d' ' -f2 | sort >$exclude_fmts
+ $av -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d'
' -f2 | sort >$exclude_fmts
$showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ print $3 }' | sort | comm
-23 - $exclude_fmts >$out_fmts
pix_fmts=$($showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ print $3 }' |
sort | comm -12 - $out_fmts)
@@ -70,7 +70,7 @@ do_lavfi_pixfmts "scale" "200:100"
do_lavfi_pixfmts "vflip" ""
if [ -n "$do_pixdesc" ]; then
- pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep
'^IO' | cut -d' ' -f2 | sort)"
+ pix_fmts="$($av -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^IO' |
cut -d' ' -f2 | sort)"
for pix_fmt in $pix_fmts; do
do_video_filter $pix_fmt "slicify=random,format=$pix_fmt,pixdesctest"
-pix_fmt $pix_fmt
done
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 979157b..5df1eae 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# common regression functions for ffmpeg
+# common regression functions for av
#
#
@@ -18,7 +18,7 @@ this="$test.$test_ref"
outfile="$datadir/$test_ref/"
# various files
-ffmpeg="$target_exec ${target_path}/ffmpeg"
+av="$target_exec ${target_path}/av"
tiny_psnr="tests/tiny_psnr"
raw_src="${target_path}/$raw_src_dir/%02d.pgm"
raw_dst="$datadir/$this.out.yuv"
@@ -48,18 +48,18 @@ COMMON_OPTS="-flags +bitexact -idct simple -sws_flags
+accurate_rnd+bitexact"
DEC_OPTS="$COMMON_OPTS -threads $threads"
ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
-run_ffmpeg()
+run_av()
{
- $echov $ffmpeg $FFMPEG_OPTS $*
- $ffmpeg $FFMPEG_OPTS $*
+ $echov $av $FFMPEG_OPTS $*
+ $av $FFMPEG_OPTS $*
}
-do_ffmpeg()
+do_av()
{
f="$1"
shift
set -- $* ${target_path}/$f
- run_ffmpeg $*
+ run_av $*
do_md5sum $f
if [ $f = $raw_dst ] ; then
$tiny_psnr $f $raw_ref
@@ -70,12 +70,12 @@ do_ffmpeg()
fi
}
-do_ffmpeg_nomd5()
+do_av_nomd5()
{
f="$1"
shift
set -- $* ${target_path}/$f
- run_ffmpeg $*
+ run_av $*
if [ $f = $raw_dst ] ; then
$tiny_psnr $f $raw_ref
elif [ $f = $pcm_dst ] ; then
@@ -85,32 +85,32 @@ do_ffmpeg_nomd5()
fi
}
-do_ffmpeg_crc()
+do_av_crc()
{
f="$1"
shift
- run_ffmpeg $* -f crc "$target_crcfile"
+ run_av $* -f crc "$target_crcfile"
echo "$f $(cat $crcfile)"
}
do_video_decoding()
{
- do_ffmpeg $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo
$ENC_OPTS -vsync 0 $2
+ do_av $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS
-vsync 0 $2
}
do_video_encoding()
{
file=${outfile}$1
- do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2
+ do_av $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2
}
do_audio_encoding()
{
file=${outfile}$1
- do_ffmpeg $file $DEC_OPTS -ac 2 -ar 44100 -f s16le -i $pcm_src -ab 128k
$ENC_OPTS $2
+ do_av $file $DEC_OPTS -ac 2 -ar 44100 -f s16le -i $pcm_src -ab 128k
$ENC_OPTS $2
}
do_audio_decoding()
{
- do_ffmpeg $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav
+ do_av $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav
}
--
1.7.5.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
