Skip to content

Commit

Permalink
FATE: allow lavf tests to alter input parameters
Browse files Browse the repository at this point in the history 
Change some lavf tests to avoid resampling and channel mixing.
  • Loading branch information
@justinruggles
justinruggles committed Apr 20, 2012
1 parent 5052980 commit acb1730
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
28 changes: 14 additions & 14 deletions tests/lavf-regression.sh
View file
Expand Up @@ -14,8 +14,8 @@ eval do_$test=y
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_streamed_images()
Expand Down Expand Up @@ -44,11 +44,11 @@ do_audio_only()
}

if [ -n "$do_avi" ] ; then
do_lavf avi "-acodec mp2"
do_lavf avi "" "-acodec mp2"
fi

if [ -n "$do_asf" ] ; then
do_lavf asf "-acodec mp2" "-r 25"
do_lavf asf "" "-acodec mp2" "-r 25"
fi

if [ -n "$do_rm" ] ; then
Expand All @@ -63,47 +63,47 @@ do_lavf mpg
fi

if [ -n "$do_mxf" ] ; then
do_lavf mxf "-ar 48000 -bf 2 -timecode_frame_start 264363"
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 -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 "-mpegts_transport_stream_id 42"
do_lavf ts "" "-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
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 -c:v mpeg4"
do_lavf mov "" "-acodec pcm_alaw -c:v mpeg4"
fi

if [ -n "$do_dv_fmt" ] ; then
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 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"
do_lavf nut "" "-acodec mp2"
fi

if [ -n "$do_mkv" ] ; then
do_lavf mkv "-c:a mp2 -c:v mpeg4"
do_lavf mkv "" "-c:a mp2 -c:v mpeg4"
fi


Expand Down
6 changes: 3 additions & 3 deletions tests/ref/lavf/dv_fmt
View file
@@ -1,3 +1,3 @@
522e5e5a46b99f8ad8aabdaf3d2f1869 *./tests/data/lavf/lavf.dv
3600000 ./tests/data/lavf/lavf.dv
./tests/data/lavf/lavf.dv CRC=0x02c0af30
62577aa72e7c7fb3e781e3717a7c36cb *./tests/data/lavf/lavf.dv
3456000 ./tests/data/lavf/lavf.dv
./tests/data/lavf/lavf.dv CRC=0x37e63092
4 changes: 2 additions & 2 deletions tests/ref/lavf/gxf
View file
@@ -1,3 +1,3 @@
346d38d330ab5cb0caa6b5537167bc0d *./tests/data/lavf/lavf.gxf
32e34e23f3740e27e5bcf1621a698aad *./tests/data/lavf/lavf.gxf
796392 ./tests/data/lavf/lavf.gxf
./tests/data/lavf/lavf.gxf CRC=0x246186eb
./tests/data/lavf/lavf.gxf CRC=0x4f52fc7f
4 changes: 2 additions & 2 deletions tests/ref/lavf/mxf
View file
@@ -1,3 +1,3 @@
6e9bd63c5cadd7550ad313553ebf665f *./tests/data/lavf/lavf.mxf
21d359aecf0453a5910d2c1a9ec906b2 *./tests/data/lavf/lavf.mxf
525881 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0x4ace0849
./tests/data/lavf/lavf.mxf CRC=0x773f059a
4 changes: 2 additions & 2 deletions tests/ref/lavf/mxf_d10
View file
@@ -1,3 +1,3 @@
e7168856f2b54c6272685967e707fb21 *./tests/data/lavf/lavf.mxf_d10
b66087558cd1ff8e64290ffd856c88bc *./tests/data/lavf/lavf.mxf_d10
5330989 ./tests/data/lavf/lavf.mxf_d10
./tests/data/lavf/lavf.mxf_d10 CRC=0xc3f4f92e
./tests/data/lavf/lavf.mxf_d10 CRC=0x4474d480
26 changes: 13 additions & 13 deletions tests/ref/seek/lavf_dv
View file
Expand Up @@ -2,51 +2,51 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
ret: 0 st:-1 flags:1 ts: 1.894167
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st: 0 flags:0 ts: 0.800000
ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:144000
ret: 0 st: 0 flags:1 ts:-0.320000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
ret: 0 st: 1 flags:0 ts: 2.576667
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st: 1 flags:1 ts: 1.470833
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st:-1 flags:0 ts: 0.365002
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:144000
ret: 0 st:-1 flags:1 ts:-0.740831
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
ret: 0 st: 0 flags:0 ts: 2.160000
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st: 0 flags:1 ts: 1.040000
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st: 1 flags:0 ts:-0.058333
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
ret: 0 st: 1 flags:1 ts: 2.835833
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st:-1 flags:0 ts: 1.730004
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:144000
ret: 0 st: 0 flags:0 ts:-0.480000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
ret: 0 st: 0 flags:1 ts: 2.400000
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st: 1 flags:0 ts: 1.306667
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st: 1 flags:1 ts: 0.200833
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st:-1 flags:0 ts:-0.904994
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
ret: 0 st:-1 flags:1 ts: 1.989173
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st: 0 flags:0 ts: 0.880000
ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:144000
ret: 0 st: 0 flags:1 ts:-0.240000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
ret: 0 st: 1 flags:0 ts: 2.671667
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st: 1 flags:1 ts: 1.565833
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000
ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:144000
ret: 0 st:-1 flags:1 ts:-0.645825
Expand Down

0 comments on commit acb1730

Please sign in to comment.