From 00f9e51a263809696b075c1b973294aca79e8e23 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 23 Dec 2014 03:34:50 +0100 Subject: tests/regression-funcs: Remove hardcoded threads 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tests which use encoders which either use slices or store the encoder thread count keep a hardcoded value of 1 This will help test more threading code like in filters Found-by: ubitux Reviewed-by: Clément Bœsch Signed-off-by: Michael Niedermayer --- tests/lavf-regression.sh | 28 ++++++++++++++-------------- tests/regression-funcs.sh | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 7e6ad06977..947e0f9b39 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -64,7 +64,7 @@ do_audio_only() } if [ -n "$do_avi" ] ; then -do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k" +do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k -threads 1" fi if [ -n "$do_asf" ] ; then @@ -79,11 +79,11 @@ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 441 fi if [ -n "$do_mpg" ] ; then -do_lavf_timecode mpg "-ab 64k -ar 44100" +do_lavf_timecode mpg "-ab 64k -ar 44100 -threads 1" fi if [ -n "$do_mxf" ] ; then -do_lavf_timecode mxf "-ar 48000 -bf 2" +do_lavf_timecode mxf "-ar 48000 -bf 2 -threads 1" fi if [ -n "$do_mxf_d10" ]; then @@ -91,7 +91,7 @@ do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vco fi if [ -n "$do_ts" ] ; then -do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100" +do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100 -threads 1" fi if [ -n "$do_swf" ] ; then @@ -99,7 +99,7 @@ do_lavf swf "" "-an" fi if [ -n "$do_ffm" ] ; then -do_lavf ffm "" "-ar 44100" +do_lavf ffm "" "-ar 44100 -threads 1" fi if [ -n "$do_flm" ] ; then @@ -111,13 +111,13 @@ do_lavf flv "" "-an" fi if [ -n "$do_mov" ] ; then -mov_common_opt="-acodec pcm_alaw -vcodec mpeg4" +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" fi if [ -n "$do_ismv" ] ; then -do_lavf_timecode ismv "-an -vcodec mpeg4" +do_lavf_timecode ismv "-an -vcodec mpeg4 -threads 1" fi if [ -n "$do_dv_fmt" ] ; then @@ -127,19 +127,19 @@ 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" -do_lavf_timecode_drop gxf "-ar 48000 -s ntsc -ac 1" -do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1" +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" +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" -do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 -ar 44100" + -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 @@ -157,7 +157,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 -threads 1" fi diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 86bc446a34..c8e7c1b801 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -46,7 +46,7 @@ echov(){ AVCONV_OPTS="-nostats -y -cpuflags $cpuflags" COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact" DEC_OPTS="$COMMON_OPTS -threads $threads" -ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint" +ENC_OPTS="$COMMON_OPTS -threads $threads -dct fastint" run_avconv() { -- cgit v1.2.3