diff options
Diffstat (limited to 'tests/lavf-regression.sh')
| -rwxr-xr-x | tests/lavf-regression.sh | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 24a0c64ce8..2d27519fa1 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -24,18 +24,18 @@ do_lavf_fate() do_lavf() { file=${outfile}lavf.$1 - do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $2 - do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3 + do_avconv $file $DEC_OPTS -f image2 -vcodec 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 + 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_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 "$@" + do_lavf $1 "" "$2" } do_streamed_images() @@ -64,11 +64,11 @@ do_audio_only() } if [ -n "$do_avi" ] ; then -do_lavf avi "-acodec mp2 -ab 64k" +do_lavf avi "" "-acodec mp2 -ab 64k" fi if [ -n "$do_asf" ] ; then -do_lavf asf "-acodec mp2 -ab 64k" "-r 25" +do_lavf asf "" "-acodec mp2 -ab 64k" "-r 25" fi if [ -n "$do_rm" ] ; then @@ -87,15 +87,15 @@ do_lavf_timecode mxf "-ar 48000 -bf 2" 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 -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" +do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -s 720x576 -vf 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_ts" ] ; then -do_lavf ts "-ab 64k -mpegts_transport_stream_id 42" +do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42" fi if [ -n "$do_swf" ] ; then -do_lavf swf -an +do_lavf swf "" "-an" fi if [ -n "$do_ffm" ] ; then @@ -103,11 +103,11 @@ do_lavf ffm "-ab 64k" fi if [ -n "$do_flv_fmt" ] ; then -do_lavf flv -an +do_lavf flv "" "-an" fi if [ -n "$do_mov" ] ; then -do_lavf mov "-movflags +rtphint -acodec pcm_alaw -vcodec mpeg4" +do_lavf mov "" "-movflags +rtphint -acodec pcm_alaw -vcodec mpeg4" do_lavf_timecode mov "-acodec pcm_alaw -vcodec mpeg4" fi @@ -118,21 +118,21 @@ 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 -r 25 -s pal -ac 2" +do_lavf dv "-ar 48000" "-r 25 -s pal -ac 2" fi if [ -n "$do_gxf" ] ; then do_lavf_timecode_nodrop gxf "-ar 48000 -r 25 -s pal -ac 1" do_lavf_timecode_drop gxf "-ar 48000 -s ntsc -ac 1" -do_lavf gxf "-ar 48000 -r 25 -s pal -ac 1" +do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1" fi if [ -n "$do_nut" ] ; then -do_lavf nut "-acodec mp2 -ab 64k" +do_lavf nut "" "-acodec mp2 -ab 64k" fi if [ -n "$do_mkv" ] ; then -do_lavf mkv "-acodec mp2 -ab 64k -vcodec mpeg4" +do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4" fi if [ -n "$do_mp3" ] ; then @@ -150,7 +150,7 @@ do_lavf_fate ogg "vp3/coeff_level64.mkv" fi if [ -n "$do_wtv" ] ; then -do_lavf wtv "-acodec mp2" +do_lavf wtv "" "-acodec mp2" fi |