Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c'

* commit '618d02c1fa9e74d490cace64a7d15762656b521c':
  tests: Convert lavf container tests to non-legacy test scripts

Merged-by: James Almer <jamrial@gmail.com>

1 files changed, 0 insertions, 121 deletions

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index f703cb9c0e..719aac205e 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -21,119 +21,6 @@ do_lavf_fate()
     do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
 }
 
-do_lavf()
-{
-    file=${outfile}lavf.$1
-    do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
-    test $5 = "disable_crc" ||
-        do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
-}
-
-do_lavf_timecode_nodrop() { do_lavf $1 "" "$2 -timecode 02:56:14:13"; }
-do_lavf_timecode_drop()   { do_lavf $1 "" "$2 -timecode 02:56:14.13 -r 30000/1001"; }
-
-do_lavf_timecode()
-{
-    do_lavf_timecode_nodrop "$@"
-    do_lavf_timecode_drop "$@"
-    do_lavf $1 "" "$2"
-}
-
-if [ -n "$do_avi" ] ; then
-do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k -threads 1"
-fi
-
-if [ -n "$do_asf" ] ; then
-do_lavf asf "" "-acodec mp2 -ar 44100 -ab 64k" "-r 25"
-fi
-
-if [ -n "$do_rm" ] ; then
-file=${outfile}lavf.rm
-# The RealMedia muxer is broken.
-do_lavf rm "" "-c:a ac3_fixed" "" disable_crc
-fi
-
-if [ -n "$do_mpg" ] ; then
-do_lavf_timecode mpg "-ab 64k -ar 44100 -threads 1"
-fi
-
-if [ -n "$do_mxf" ] ; then
-do_lavf_timecode mxf "-ar 48000 -bf 2 -threads 1"
-fi
-
-if [ -n "$do_mxf_d10" ]; then
-do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -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_mxf_dv25" ]; then
-do_lavf mxf_dv25 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=4/3 -vcodec dvvideo -pix_fmt yuv420p -b 25000k -top 0 -f mxf"
-fi
-
-if [ -n "$do_mxf_dvcpro50" ]; then
-do_lavf mxf_dvcpro50 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=16/9 -vcodec dvvideo -pix_fmt yuv422p -b 50000k -top 0 -f mxf"
-fi
-
-if [ -n "$do_mxf_opatom" ]; then
-do_lavf mxf_opatom "" "-s 1920x1080 -vcodec dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0"
-fi
-
-if [ -n "$do_mxf_opatom_audio" ]; then
-do_lavf mxf_opatom_audio "-ar 48000 -ac 1" "-f mxf_opatom -mxf_audio_edit_rate 25 -map 1"
-fi
-
-if [ -n "$do_ts" ] ; then
-do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100 -threads 1"
-fi
-
-if [ -n "$do_swf" ] ; then
-do_lavf swf "" "-an"
-fi
-
-if [ -n "$do_ffm" ] ; then
-do_lavf ffm "" "-ar 44100 -threads 1"
-fi
-
-if [ -n "$do_flm" ] ; then
-do_lavf flm "" "-pix_fmt rgba"
-fi
-
-if [ -n "$do_flv_fmt" ] ; then
-do_lavf flv "" "-an"
-fi
-
-if [ -n "$do_mov" ] ; then
-mov_common_opt="-acodec pcm_alaw -vcodec mpeg4 -threads 1"
-do_lavf mov "" "-movflags +rtphint $mov_common_opt"
-do_lavf_timecode mov "-movflags +faststart $mov_common_opt"
-do_lavf_timecode mp4 "-vcodec mpeg4 -an -threads 1"
-fi
-
-if [ -n "$do_ismv" ] ; then
-do_lavf_timecode ismv "-an -vcodec mpeg4 -threads 1"
-fi
-
-if [ -n "$do_dv_fmt" ] ; then
-do_lavf_timecode_nodrop dv "-ar 48000 -r 25 -s pal -ac 2"
-do_lavf_timecode_drop   dv "-ar 48000 -pix_fmt yuv411p -s ntsc -ac 2"
-do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
-fi
-
-if [ -n "$do_gxf" ] ; then
-do_lavf_timecode_nodrop gxf "-ar 48000 -r 25 -s pal -ac 1 -threads 1"
-do_lavf_timecode_drop   gxf "-ar 48000 -s ntsc -ac 1 -threads 1"
-do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1 -threads 1"
-fi
-
-if [ -n "$do_nut" ] ; then
-do_lavf nut "" "-acodec mp2 -ab 64k -ar 44100 -threads 1"
-fi
-
-if [ -n "$do_mkv" ] ; then
-do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 \
- -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap -threads 1"
-do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 -ar 44100 -threads 1"
-fi
-
 if [ -n "$do_mp3" ] ; then
 do_lavf_fate mp3 "mp3-conformance/he_32khz.bit" "-acodec copy"
 fi
@@ -162,10 +49,6 @@ DEC_OPTS="$DEC_OPTS -idct auto"
 do_lavf_fate avi "cram/toon.avi"
 fi
 
-if [ -n "$do_wtv" ] ; then
-do_lavf wtv "" "-acodec mp2 -threads 1"
-fi
-
 
 # streamed images
 # mjpeg
@@ -205,7 +88,3 @@ for pix_fmt in $pix_fmts ; do
     do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt $pix_fmt
 done
 fi
-
-if [ -n "$do_smjpeg" ] ; then
-do_lavf smjpeg "" "-f smjpeg"
-fi