Merge remote-tracking branch 'qatar/master'

[ffmpeg] / tests / regression-funcs.sh

diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 827a424582737ace4fe7c4fbe3da8b8492599fee..75387952e755ded76d600bd262322d25276c1634 100755 (executable)
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# common regression functions for avconv
+# common regression functions for ffmpeg
 #
 #
 
@@ -20,20 +20,16 @@ this="$test.$test_ref"
 outfile="$datadir/$test_ref/"
 
 # various files
-avconv="$target_exec ${target_path}/ffmpeg"
-tiny_psnr="tests/tiny_psnr"
+ffmpeg="$target_exec ${target_path}/ffmpeg"
 raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 raw_dst="$datadir/$this.out.yuv"
-raw_ref="$datadir/$test_ref.ref.yuv"
 pcm_src="$target_datadir/asynth1.sw"
-pcm_dst="$datadir/$this.out.wav"
-pcm_ref="$datadir/$test_ref.ref.wav"
 pcm_src_1ch="$target_datadir/asynth-16000-1.wav"
 pcm_ref_1ch="$datadir/$test_ref-16000-1.ref.wav"
 crcfile="$datadir/$this.crc"
 target_crcfile="$target_datadir/$this.crc"
 
-cleanfiles="$raw_dst $pcm_dst $crcfile"
+cleanfiles="$raw_dst $crcfile"
 trap 'rm -f -- $cleanfiles' EXIT
 
 mkdir -p "$datadir"
@@ -54,8 +50,8 @@ ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
 
 run_avconv()
 {
-    $echov $avconv $AVCONV_OPTS $*
-    $avconv $AVCONV_OPTS $*
+    $echov $ffmpeg $AVCONV_OPTS $*
+    $ffmpeg $AVCONV_OPTS $*
 }
 
 do_avconv()
@@ -65,13 +61,7 @@ do_avconv()
     set -- $* ${target_path}/$f
     run_avconv $*
     do_md5sum $f
-    if [ $f = $raw_dst ] ; then
-        $tiny_psnr $f $raw_ref
-    elif [ $f = $pcm_dst ] ; then
-        $tiny_psnr $f $pcm_ref 2
-    else
-        echo $(wc -c $f)
-    fi
+    echo $(wc -c $f)
 }
 
 do_avconv_nomd5()
@@ -96,36 +86,3 @@ do_avconv_crc()
     run_avconv $* -f crc "$target_crcfile"
     echo "$f $(cat $crcfile)"
 }
-
-do_video_decoding()
-{
-    do_avconv $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS -vsync 0 $2
-}
-
-do_video_encoding()
-{
-    file=${outfile}$1
-    do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2
-}
-
-do_video_encoding_nomd5()
-{
-    file=${outfile}$1
-    do_avconv_nomd5 $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2
-}
-
-do_audio_encoding()
-{
-    file=${outfile}$1
-    do_avconv $file $DEC_OPTS -ac 2 -ar 44100 -f s16le -i $pcm_src -ab 128k $ENC_OPTS $2
-}
-
-do_audio_decoding()
-{
-    do_avconv $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav $1
-}
-
-do_audio_decoding_nomd5()
-{
-    do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav $1
-}