remove redundant declarations

[ffmpeg] / tests / regression.sh

diff --git a/tests/regression.sh b/tests/regression.sh
index 2706cb4f2a0e2ebc59036e193357c930701526fa..3f9f0bb11218c970f36ea993fb808d5a4e7c431a 100755 (executable)
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -38,6 +38,8 @@ elif [ "$1" = "mpeg2thread" ] ; then
     do_mpeg2thread=y
 elif [ "$1" = "snow" ] ; then
     do_snow=y
+elif [ "$1" = "snowll" ] ; then
+    do_snowll=y
 elif [ "$1" = "libavtest" ] ; then
     do_libav=y
     logfile="$datadir/libav.regression"
@@ -54,9 +56,11 @@ else
     do_h263=y
     do_h263p=y
     do_mpeg4=y
+    do_mp4psp=y
     do_huffyuv=y
     do_mjpeg=y
     do_ljpeg=y
+    do_jpegls=y
     do_rv10=y
     do_rv20=y
     do_mp2=y
@@ -64,6 +68,7 @@ else
     do_g726=y
     do_adpcm_ima_wav=y
     do_adpcm_ms=y
+    do_flac=y
     do_rc=y
     do_mpeg4adv=y
     do_mpeg4thread=y
@@ -76,8 +81,10 @@ else
     do_error=y
     do_svq1=y
     do_snow=y
+    do_snowll=y
     do_adpcm_yam=y
     do_dv=y
+    do_dv50=y
 fi
 
 
@@ -173,6 +180,13 @@ do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1v
 # mpeg2 decoding
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
 
+# mpeg2 encoding using intra vlc
+file=${outfile}mpeg2ivlc.mpg
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video -flags2 +ivlc $file
+
+# mpeg2 decoding
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+
 # mpeg2 encoding
 file=${outfile}mpeg2.mpg
 do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -idct int -dct int -f mpeg1video $file
@@ -197,6 +211,13 @@ do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1v
 # mpeg2 decoding
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
 
+# mpeg2 encoding interlaced using intra vlc
+file=${outfile}mpeg2threadivlc.mpg
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2 $file
+
+# mpeg2 decoding
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+
 # mpeg2 encoding interlaced
 file=${outfile}mpeg2reuse.mpg
 do_ffmpeg $file -y -sameq -me_threshold 256 -mb_threshold 1024 -i ${outfile}mpeg2thread.mpg -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 $file
@@ -335,6 +356,13 @@ do_ffmpeg $file -y -qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2 -f p
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
 fi
 
+###################################
+if [ -n "$do_mp4psp" ] ; then
+# mp4 PSP style
+file=${outfile}mpeg4-PSP.mp4
+do_ffmpeg $file -y -b 768 -s 320x240 -f psp -ar 24000 -ab 32 -i $raw_src $file
+fi
+
 ###################################
 if [ -n "$do_error" ] ; then
 # damaged mpeg4
@@ -385,6 +413,16 @@ do_ffmpeg $file -y -f pgmyuv -i $raw_src -an -vcodec ljpeg -strict -1 $file
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
 fi
 
+###################################
+if [ -n "$do_jpegls" ] ; then
+# jpeg ls
+file=${outfile}jpegls.avi
+do_ffmpeg $file -y -f pgmyuv -i $raw_src -an -vcodec jpegls -vtag MJPG $file
+
+# jpeg ls decoding
+do_ffmpeg $raw_dst -y -i $file -f rawvideo -pix_fmt yuv420p $raw_dst
+fi
+
 ###################################
 if [ -n "$do_rv10" ] ; then
 # rv10 encoding
@@ -449,14 +487,17 @@ fi
 if [ -n "$do_snow" ] ; then
 # snow encoding
 file=${outfile}snow.avi
-do_ffmpeg $file -y -strict -2 -f pgmyuv -i $raw_src -an -vcodec snow -qscale 2 $file
+do_ffmpeg $file -y -strict -2 -f pgmyuv -i $raw_src -an -vcodec snow -qscale 2 -flags +qpel -me iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64 $file
 
 # snow decoding
-do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
+do_ffmpeg $raw_dst -y -i $file -f rawvideo -s 352x288 $raw_dst
+fi
 
+###################################
+if [ -n "$do_snowll" ] ; then
 # snow encoding
 file=${outfile}snow53.avi
-do_ffmpeg $file -y -strict -2 -f pgmyuv -i $raw_src -an -vcodec snow -pred 1 -flags +mv4+qpel $file
+do_ffmpeg $file -y -strict -2 -f pgmyuv -i $raw_src -an -vcodec snow -qscale .001 -pred 1 -flags +mv4+qpel $file
 
 # snow decoding
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
@@ -472,6 +513,17 @@ do_ffmpeg $file -dct int -y -f pgmyuv -i $raw_src -s pal -an $file
 do_ffmpeg $raw_dst -y -i $file -f rawvideo -s cif $raw_dst
 fi
 
+###################################
+if [ -n "$do_dv50" ] ; then
+# dv50 encoding
+file=${outfile}dv.dv
+do_ffmpeg $file -dct int -y -f pgmyuv -i $raw_src -s pal -pix_fmt yuv422p -an $file
+
+# dv50 decoding
+do_ffmpeg $raw_dst -y -i $file -f rawvideo -s cif -pix_fmt yuv420p $raw_dst
+fi
+
+
 ###################################
 if [ -n "$do_svq1" ] ; then
 # svq1 encoding
@@ -543,6 +595,16 @@ do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -acodec adpcm_ya
 do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
 fi
 
+###################################
+if [ -n "$do_flac" ] ; then
+# encoding
+file=${outfile}flac.flac
+do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -acodec flac -compression_level 2 $file
+
+# decoding
+do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
+fi
+
 ###################################
 # libav testing
 ###################################
@@ -605,6 +667,11 @@ file=${outfile}libav.dv
 do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src -ar 48000 -r 25 -s pal -ac 2 $file
 do_ffmpeg_crc $file -i $file
 
+# gxf
+file=${outfile}libav.gxf
+do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src -ar 48000 -r 25 -s pal -ac 1 $file
+do_ffmpeg_crc $file -i $file
+
 ####################
 # streamed images
 # mjpeg
@@ -629,7 +696,7 @@ do_ffmpeg_crc $file -f image2pipe -i $file
 
 # gif
 file=${outfile}libav.gif
-do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
+do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -pix_fmt rgb24 $file
 #do_ffmpeg_crc $file -i $file
 
 # yuv4mpeg
@@ -682,11 +749,21 @@ file=${outfile}libav.mmf
 do_ffmpeg $file -t 1 -y -qscale 10 -f s16le -i $pcm_src $file
 do_ffmpeg_crc $file -i $file
 
+# aiff
+file=${outfile}libav.aif
+do_ffmpeg $file -t 1 -y -qscale 10 -f s16le -i $pcm_src $file
+do_ffmpeg_crc $file -i $file
+
+# voc
+file=${outfile}libav.voc
+do_ffmpeg $file -t 1 -y -qscale 10 -f s16le -i $pcm_src $file
+do_ffmpeg_crc $file -i $file
+
 ####################
 # pix_fmt conversions
 conversions="yuv420p yuv422p yuv444p yuv422 yuv410p yuv411p yuvj420p \
              yuvj422p yuvj444p rgb24 bgr24 rgba32 rgb565 rgb555 gray monow \
-            monob pal8"
+             monob pal8"
 for pix_fmt in $conversions ; do
     file=${outfile}libav-${pix_fmt}.yuv
     do_ffmpeg_nocheck $file -r 1 -t 1 -y -f pgmyuv -i $raw_src \