---
tests/Makefile | 6 +-
tests/codec-regression.sh | 120 ++++++++++++++++++++++----------------------
tests/fate-run.sh | 14 +++---
tests/fate.mak | 36 +++++++-------
tests/fate/mp3.mak | 14 +++---
tests/fate2.mak | 2 +-
tests/lavf-regression.sh | 50 +++++++++---------
tests/lavfi-regression.sh | 8 ++--
tests/regression-funcs.sh | 32 ++++++------
9 files changed, 141 insertions(+), 141 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 7014bf5..b511a9a 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): avconv$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
+$(AREF): avconv$(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): avconv$(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..7222c6b 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 avconv
#
#
#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_avconv $raw_ref -f image2 -c:v pgmyuv -i $raw_src -an -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_avconv $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav
fi
if [ -n "$do_mpeg" ] ; then
@@ -27,137 +27,137 @@ fi
if [ -n "$do_mpeg2" ] ; then
# mpeg2
-do_video_encoding mpeg2.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video"
+do_video_encoding mpeg2.mpg "-qscale 10 -c:v mpeg2video -f mpeg1video"
do_video_decoding
# mpeg2 encoding intra vlc qprd
-do_video_encoding mpeg2ivlc-qprd.mpg "-vb 500k -bf 2 -trellis 1 -flags
+qprd+mv0 -flags2 +ivlc -cmp 2 -subcmp 2 -mbd rd -vcodec mpeg2video -f
mpeg2video"
+do_video_encoding mpeg2ivlc-qprd.mpg "-vb 500k -bf 2 -trellis 1 -flags
+qprd+mv0 -flags2 +ivlc -cmp 2 -subcmp 2 -mbd rd -c:v mpeg2video -f mpeg2video"
do_video_decoding
#mpeg2 4:2:2 encoding
-do_video_encoding mpeg2_422.mpg "-vb 1000k -bf 2 -trellis 1 -flags
+qprd+mv0+ildct+ilme -flags2 +ivlc -mbd rd -vcodec mpeg2video -pix_fmt yuv422p
-f mpeg2video"
+do_video_encoding mpeg2_422.mpg "-vb 1000k -bf 2 -trellis 1 -flags
+qprd+mv0+ildct+ilme -flags2 +ivlc -mbd rd -c:v mpeg2video -pix_fmt yuv422p -f
mpeg2video"
do_video_decoding
# mpeg2
-do_video_encoding mpeg2.mpg "-qscale 10 -vcodec mpeg2video -idct int -dct int
-f mpeg1video"
+do_video_encoding mpeg2.mpg "-qscale 10 -c:v mpeg2video -idct int -dct int -f
mpeg1video"
do_video_decoding "-idct int"
# mpeg2 encoding interlaced
-do_video_encoding mpeg2i.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video
-flags +ildct+ilme"
+do_video_encoding mpeg2i.mpg "-qscale 10 -c:v mpeg2video -f mpeg1video -flags
+ildct+ilme"
do_video_decoding
fi
if [ -n "$do_mpeg2thread" ] ; then
# mpeg2 encoding interlaced
-do_video_encoding mpeg2thread.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video
-bf 2 -flags +ildct+ilme -threads 2"
+do_video_encoding mpeg2thread.mpg "-qscale 10 -c:v mpeg2video -f mpeg1video
-bf 2 -flags +ildct+ilme -threads 2"
do_video_decoding
# mpeg2 encoding interlaced using intra vlc
-do_video_encoding mpeg2threadivlc.mpg "-qscale 10 -vcodec mpeg2video -f
mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2"
+do_video_encoding mpeg2threadivlc.mpg "-qscale 10 -c:v mpeg2video -f
mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2"
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_avconv $file $DEC_OPTS -me_threshold 256 -i
${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -sameq -me_threshold 256
-mb_threshold 1024 -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v
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 -an -c:v 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 "-an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v
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 -an -c:v 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 -an -c:v 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 "-an -c:v 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 "-an -c:v jpegls -vtag MJPG -sws_flags
neighbor+full_chroma_int+accurate_rnd+bitexact"
do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+bitexact"
fi
@@ -167,37 +167,37 @@ 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 -c:v rv20 -an"
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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v 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 -an -c:v snow -qscale .001 -pred 1
-flags +mv4+qpel"
do_video_decoding
fi
@@ -216,7 +216,7 @@ 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 "-c:v dnxhd -flags +ildct -s hd1080 -b 120M
-pix_fmt yuv422p -vframes 5 -an"
do_video_decoding "" "-s cif -pix_fmt yuv420p"
fi
@@ -236,12 +236,12 @@ 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 "-an -c:v 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 "-an -c:v 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 "-an -c:v 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 "-an -c:v 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 "-an -c:v rawvideo -pix_fmt yuv420p"
do_video_decoding "" "-pix_fmt yuv420p"
fi
@@ -272,72 +272,72 @@ $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 "-vn -c:a ac3_fixed"
# binaries configured with --disable-sse decode ac3 differently
#do_audio_decoding
#$tiny_psnr $pcm_dst $pcm_ref 2 1024
fi
if [ -n "$do_g726" ] ; then
-do_audio_encoding g726.wav "-ab 32k -ac 1 -ar 8000 -acodec g726"
+do_audio_encoding g726.wav "-ab 32k -ac 1 -ar 8000 -c:a g726"
do_audio_decoding
fi
if [ -n "$do_adpcm_ima_wav" ] ; then
-do_audio_encoding adpcm_ima.wav "-acodec adpcm_ima_wav"
+do_audio_encoding adpcm_ima.wav "-c:a adpcm_ima_wav"
do_audio_decoding
fi
if [ -n "$do_adpcm_ima_qt" ] ; then
-do_audio_encoding adpcm_qt.aiff "-acodec adpcm_ima_qt"
+do_audio_encoding adpcm_qt.aiff "-c:a adpcm_ima_qt"
do_audio_decoding
fi
if [ -n "$do_adpcm_ms" ] ; then
-do_audio_encoding adpcm_ms.wav "-acodec adpcm_ms"
+do_audio_encoding adpcm_ms.wav "-c:a adpcm_ms"
do_audio_decoding
fi
if [ -n "$do_adpcm_yam" ] ; then
-do_audio_encoding adpcm_yam.wav "-acodec adpcm_yamaha"
+do_audio_encoding adpcm_yam.wav "-c:a adpcm_yamaha"
do_audio_decoding
fi
if [ -n "$do_adpcm_swf" ] ; then
-do_audio_encoding adpcm_swf.flv "-acodec adpcm_swf"
+do_audio_encoding adpcm_swf.flv "-c:a adpcm_swf"
do_audio_decoding
fi
if [ -n "$do_alac" ] ; then
-do_audio_encoding alac.m4a "-acodec alac -compression_level 1"
+do_audio_encoding alac.m4a "-c:a alac -compression_level 1"
do_audio_decoding
fi
if [ -n "$do_flac" ] ; then
-do_audio_encoding flac.flac "-acodec flac -compression_level 2"
+do_audio_encoding flac.flac "-c:a flac -compression_level 2"
do_audio_decoding
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_audio_encoding wmav1.asf "-c:a wmav1"
+do_avconv_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_audio_encoding wmav2.asf "-c:a wmav2"
+do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav
$tiny_psnr $pcm_dst $pcm_ref 2 8192
fi
#if [ -n "$do_vorbis" ] ; then
# vorbis
#disabled because it is broken
-#do_audio_encoding vorbis.asf "-acodec vorbis"
+#do_audio_encoding vorbis.asf "-c:a vorbis"
#do_audio_decoding
#fi
do_audio_enc_dec() {
- do_audio_encoding $3.$1 "$4 -sample_fmt $2 -acodec $3"
+ do_audio_encoding $3.$1 "$4 -sample_fmt $2 -c:a $3"
do_audio_decoding
}
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 4121035..f623eec 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 "$@"
+avconv(){
+ run avconv -v 0 -threads $threads -thread_type $thread_type "$@"
}
framecrc(){
- ffmpeg "$@" -f framecrc -
+ avconv "$@" -f framecrc -
}
framemd5(){
- ffmpeg "$@" -f framemd5 -
+ avconv "$@" -f framemd5 -
}
crc(){
- ffmpeg "$@" -f crc -
+ avconv "$@" -f crc -
}
md5(){
- ffmpeg "$@" md5:
+ avconv "$@" md5:
}
pcm(){
- ffmpeg "$@" -vn -f s16le -
+ avconv "$@" -vn -f s16le -
}
regtest(){
diff --git a/tests/fate.mak b/tests/fate.mak
index 0e33311..d15b700 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -5,7 +5,7 @@ fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm
-pix_fmt rgb24 -an
FATE_TESTS += fate-8bps
fate-8bps: CMD = framecrc -i $(SAMPLES)/8bps/full9iron-partial.mov -pix_fmt
rgb24
FATE_TESTS += fate-aac-demux
-fate-aac-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy
+fate-aac-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -c:a 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
@@ -13,7 +13,7 @@ fate-adpcm-ea-r2: CMD = crc -i
$(SAMPLES)/ea-mpc/THX_logo.mpc -vn
FATE_TESTS += fate-adpcm-ea-r3
fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn
FATE_TESTS += fate-aea-demux
-fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy
+fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -c:a copy
FATE_TESTS += fate-alg-mm
fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24
FATE_TESTS += fate-amv
@@ -29,7 +29,7 @@ fate-bethsoft-vid: CMD = framecrc -i
$(SAMPLES)/bethsoft-vid/ANIM0001.VID -vsyn
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 -vn -c:a copy
FATE_TESTS += fate-bink-demux-video
fate-bink-demux-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
FATE_TESTS += fate-caf
@@ -63,7 +63,7 @@ fate-cyberia-c93: CMD = framecrc -i
$(SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix
FATE_TESTS += fate-cyuv
fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi
FATE_TESTS += fate-d-cinema-demux
-fate-d-cinema-demux: CMD = framecrc -i
$(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -pix_fmt rgb24
+fate-d-cinema-demux: CMD = framecrc -i
$(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -c:a copy -pix_fmt rgb24
FATE_TESTS += fate-delphine-cin
fate-delphine-cin: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN
-pix_fmt rgb24 -vsync 0
FATE_TESTS += fate-deluxepaint-anm
@@ -129,7 +129,7 @@ fate-id-cin-video: CMD = framecrc -i
$(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rg
FATE_TESTS += fate-idroq-video-dpcm
fate-idroq-video-dpcm: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq
FATE_TESTS += fate-idroq-video-encode
-fate-idroq-video-encode: CMD = md5 -t 0.2 -f image2 -vcodec pgmyuv -i
$(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf
pad=512:512:80:112 -f RoQ
+fate-idroq-video-encode: CMD = md5 -t 0.2 -f image2 -c:v pgmyuv -i
$(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf
pad=512:512:80:112 -f RoQ
FATE_TESTS += fate-iff-byterun1
fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
FATE_TESTS += fate-iff-fibonacci
@@ -149,11 +149,11 @@ fate-interplay-mve-16bit: CMD = framecrc -i
$(SAMPLES)/interplay-mve/descent3-l
FATE_TESTS += fate-interplay-mve-8bit
fate-interplay-mve-8bit: CMD = framecrc -i
$(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24
FATE_TESTS += fate-iv8-demux
-fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vsync 0
-vcodec copy
+fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vsync 0
-c:v copy
FATE_TESTS += fate-kmvc
fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -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-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t
3 -c:a copy -c:v copy
FATE_TESTS += fate-loco-rgb
fate-loco-rgb: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-rgb.avi
FATE_TESTS += fate-loco-yuy2
@@ -177,9 +177,9 @@ fate-mimic: CMD = framecrc -idct simple -i
$(SAMPLES)/mimic/mimic2-womanloveffm
FATE_TESTS += fate-motionpixels
fate-motionpixels: CMD = framecrc -i
$(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24
FATE_TESTS += fate-mpc7-demux
-fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy
+fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -c:a copy
FATE_TESTS += fate-mpc8-demux
-fate-mpc8-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy
+fate-mpc8-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp8.mpc -c:a copy
FATE_TESTS += fate-msrle-8bit
fate-msrle-8bit: CMD = framecrc -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt
rgb24
FATE_TESTS += fate-msvideo1-16bit
@@ -189,17 +189,17 @@ fate-msvideo1-8bit: CMD = framecrc -i
$(SAMPLES)/cram/skating.avi -t 1 -pix_fmt
FATE_TESTS += fate-mszh
fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi
FATE_TESTS += fate-mtv
-fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -acodec
copy -pix_fmt rgb24
+fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c:a
copy -pix_fmt rgb24
FATE_TESTS += fate-mxf-demux
-fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy
-vcodec copy
+fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -c copy
FATE_TESTS += fate-nc-demux
-fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial
-vcodec copy
+fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -c:v
copy
FATE_TESTS += fate-nsv-demux
-fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6
-vcodec copy -acodec copy
+fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6
-c copy
FATE_TESTS += fate-nuv
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-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -c:a copy
FATE_TESTS += fate-pcm_dvd
fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
FATE_TESTS += fate-psx-str
@@ -211,9 +211,9 @@ fate-psx-str-v3-adpcm_xa: CMD = framecrc -i
$(SAMPLES)/psx-str/abc000_cut.str -
FATE_TESTS += fate-ptx
fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
FATE_TESTS += fate-pva-demux
-fate-pva-demux: CMD = framecrc -idct simple -i
$(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy
+fate-pva-demux: CMD = framecrc -idct simple -i
$(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -c:a copy
FATE_TESTS += fate-qcp-demux
-fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy
+fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -c:a copy
FATE_TESTS += fate-qpeg
fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
FATE_TESTS += fate-qt-alaw-mono
@@ -269,7 +269,7 @@ 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_TESTS += fate-redcode-demux
-fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec
copy -acodec copy
+fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -c copy
FATE_TESTS += fate-rl2
fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an
-vsync 0
FATE_TESTS += fate-rpza
@@ -341,7 +341,7 @@ fate-vp6f: CMD = framecrc -i
$(SAMPLES)/flash-vp6/clip1024.flv
FATE_TESTS += fate-vqa-cc
fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt
rgb24
FATE_TESTS += fate-vqf-demux
-fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f
framecrc
+fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -c:a copy -f framecrc
FATE_TESTS += fate-w64
fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
FATE_TESTS += fate-wc3movie-xan
diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak
index 859a4f3..01d9594 100644
--- a/tests/fate/mp3.mak
+++ b/tests/fate/mp3.mak
@@ -1,35 +1,35 @@
FATE_MP3 += fate-mp3-float-conf-compl
-fate-mp3-float-conf-compl: CMD = pcm -acodec mp3float -i
$(SAMPLES)/mp3-conformance/compl.bit
+fate-mp3-float-conf-compl: CMD = pcm -c:a mp3float -i
$(SAMPLES)/mp3-conformance/compl.bit
fate-mp3-float-conf-compl: CMP = stddev
fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.pcm
FATE_MP3 += fate-mp3-float-conf-he_32khz
-fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -fs 343296 -i
$(SAMPLES)/mp3-conformance/he_32khz.bit
+fate-mp3-float-conf-he_32khz: CMD = pcm -c:a mp3float -fs 343296 -i
$(SAMPLES)/mp3-conformance/he_32khz.bit
fate-mp3-float-conf-he_32khz: CMP = stddev
fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.pcm
FATE_MP3 += fate-mp3-float-conf-he_44khz
-fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -fs 942336 -i
$(SAMPLES)/mp3-conformance/he_44khz.bit
+fate-mp3-float-conf-he_44khz: CMD = pcm -c:a mp3float -fs 942336 -i
$(SAMPLES)/mp3-conformance/he_44khz.bit
fate-mp3-float-conf-he_44khz: CMP = stddev
fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.pcm
FATE_MP3 += fate-mp3-float-conf-he_48khz
-fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -fs 343296 -i
$(SAMPLES)/mp3-conformance/he_48khz.bit
+fate-mp3-float-conf-he_48khz: CMD = pcm -c:a mp3float -fs 343296 -i
$(SAMPLES)/mp3-conformance/he_48khz.bit
fate-mp3-float-conf-he_48khz: CMP = stddev
fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.pcm
FATE_MP3 += fate-mp3-float-conf-hecommon
-fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -fs 133632 -i
$(SAMPLES)/mp3-conformance/hecommon.bit
+fate-mp3-float-conf-hecommon: CMD = pcm -c:a mp3float -fs 133632 -i
$(SAMPLES)/mp3-conformance/hecommon.bit
fate-mp3-float-conf-hecommon: CMP = stddev
fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.pcm
FATE_MP3 += fate-mp3-float-conf-si
-fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -fs 269568 -i
$(SAMPLES)/mp3-conformance/si.bit
+fate-mp3-float-conf-si: CMD = pcm -c:a mp3float -fs 269568 -i
$(SAMPLES)/mp3-conformance/si.bit
fate-mp3-float-conf-si: CMP = stddev
fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.pcm
FATE_MP3 += fate-mp3-float-conf-si_block
-fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -fs 145152 -i
$(SAMPLES)/mp3-conformance/si_block.bit
+fate-mp3-float-conf-si_block: CMD = pcm -c:a mp3float -fs 145152 -i
$(SAMPLES)/mp3-conformance/si_block.bit
fate-mp3-float-conf-si_block: CMP = stddev
fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.pcm
diff --git a/tests/fate2.mak b/tests/fate2.mak
index a743f0c..0024a96 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -172,7 +172,7 @@ FATE_TESTS += fate-wmv8-drm
fate-wmv8-drm: CMD = framecrc -cryptokey
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an
-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 -c copy
FATE_TESTS += fate-binkaudio-dct
fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 38a190c..a4f8127 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_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar
44100 -f s16le -i $pcm_src $ENC_OPTS -ab 64k -t 1 -qscale 10 $2
+ do_avconv_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_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src -f image2pipe
$ENC_OPTS -t 1 -qscale 10
+ do_avconv_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_avconv $DEC_OPTS -f image2 -c:v 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_avconv_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_avconv $file $DEC_OPTS $2 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1
-qscale 10 $3
+ do_avconv_crc $file $DEC_OPTS $4 -i $target_path/$file
}
if [ -n "$do_avi" ] ; then
@@ -48,14 +48,14 @@ do_lavf avi
fi
if [ -n "$do_asf" ] ; then
-do_lavf asf "-acodec mp2" "-r 25"
+do_lavf asf "-c:a mp2" "-r 25"
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_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar
44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -c:a ac3_fixed -ab 64k
# broken
-#do_ffmpeg_crc $file -i $target_path/$file
+#do_avconv_crc $file -i $target_path/$file
fi
if [ -n "$do_mpg" ] ; then
@@ -67,7 +67,7 @@ do_lavf mxf "-ar 48000 -bf 2 -timecode_frame_start 264363"
fi
if [ -n "$do_mxf_d10" ]; then
-do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec
mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q
-qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p
-minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1
-rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
+do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32 -c:v
mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q
-qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p
-minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1
-rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
fi
if [ -n "$do_ts" ] ; then
@@ -75,7 +75,7 @@ do_lavf ts
fi
if [ -n "$do_swf" ] ; then
-do_lavf swf -an
+do_lavf swf "-an"
fi
if [ -n "$do_ffm" ] ; then
@@ -83,11 +83,11 @@ do_lavf ffm
fi
if [ -n "$do_flv_fmt" ] ; then
-do_lavf flv -an
+do_lavf flv "-an"
fi
if [ -n "$do_mov" ] ; then
-do_lavf mov "-acodec pcm_alaw"
+do_lavf mov "-c:a pcm_alaw"
fi
if [ -n "$do_dv_fmt" ] ; then
@@ -99,7 +99,7 @@ do_lavf gxf "-ar 48000 -r 25 -s pal -ac 1"
fi
if [ -n "$do_nut" ] ; then
-do_lavf nut "-acodec mp2"
+do_lavf nut "-c:a mp2"
fi
if [ -n "$do_mkv" ] ; 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_avconv $file -t 1 -qscale 10 -f image2 -c:v pgmyuv -i $raw_src
+#do_avconv_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_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1
-qscale 10 -pix_fmt rgb24
+do_avconv_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_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1
-qscale 10
+#do_avconv_crc $file -i $target_path/$file
fi
# image formats
@@ -206,7 +206,7 @@ do_audio_only voc
fi
if [ -n "$do_voc_s16" ] ; then
-do_audio_only s16.voc "-ac 2" "-acodec pcm_s16le"
+do_audio_only s16.voc "-ac 2" "-c:a pcm_s16le"
fi
if [ -n "$do_ogg" ] ; then
@@ -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_avconv $DEC_OPTS -r 1 -t 1 -f image2 -c:v 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_avconv $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..0436844 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -16,8 +16,8 @@ do_video_filter() {
filters=$2
shift 2
printf '%-20s' $label
- run_ffmpeg $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
- $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
+ run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src \
+ $ENC_OPTS -vf "$filters" -c:v rawvideo $* -f nut md5:
}
do_lavfi() {
@@ -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
+ $avconv -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="$($avconv -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..afc24ec 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 avconv
#
#
@@ -18,7 +18,7 @@ this="$test.$test_ref"
outfile="$datadir/$test_ref/"
# various files
-ffmpeg="$target_exec ${target_path}/ffmpeg"
+avconv="$target_exec ${target_path}/avconv"
tiny_psnr="tests/tiny_psnr"
raw_src="${target_path}/$raw_src_dir/%02d.pgm"
raw_dst="$datadir/$this.out.yuv"
@@ -43,23 +43,23 @@ echov(){
. $(dirname $0)/md5.sh
-FFMPEG_OPTS="-v 0 -y"
+AVCONV_OPTS="-v 0 -y"
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_avconv()
{
- $echov $ffmpeg $FFMPEG_OPTS $*
- $ffmpeg $FFMPEG_OPTS $*
+ $echov $avconv $AVCONV_OPTS $*
+ $avconv $AVCONV_OPTS $*
}
-do_ffmpeg()
+do_avconv()
{
f="$1"
shift
set -- $* ${target_path}/$f
- run_ffmpeg $*
+ run_avconv $*
do_md5sum $f
if [ $f = $raw_dst ] ; then
$tiny_psnr $f $raw_ref
@@ -70,12 +70,12 @@ do_ffmpeg()
fi
}
-do_ffmpeg_nomd5()
+do_avconv_nomd5()
{
f="$1"
shift
set -- $* ${target_path}/$f
- run_ffmpeg $*
+ run_avconv $*
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_avconv_crc()
{
f="$1"
shift
- run_ffmpeg $* -f crc "$target_crcfile"
+ run_avconv $* -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_avconv $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_avconv $file $DEC_OPTS -f image2 -c:v 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_avconv $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_avconv $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
