#!/bin/sh
#
-# common regression functions for avconv
+# common regression functions for ffmpeg
#
#
outfile="$datadir/$test_ref/"
# various files
-avconv="$target_exec ${target_path}/ffmpeg"
+ffmpeg="$target_exec ${target_path}/ffmpeg"
tiny_psnr="tests/tiny_psnr"
raw_src="${target_path}/$raw_src_dir/%02d.pgm"
raw_dst="$datadir/$this.out.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"
run_avconv()
{
- $echov $avconv $AVCONV_OPTS $*
- $avconv $AVCONV_OPTS $*
+ $echov $ffmpeg $AVCONV_OPTS $*
+ $ffmpeg $AVCONV_OPTS $*
}
do_avconv()
elif [ $f = $pcm_dst ] ; then
$tiny_psnr $f $pcm_ref 2
else
- wc -c $f
+ echo $(wc -c $f)
fi
}
elif [ $f = $pcm_dst ] ; then
$tiny_psnr $f $pcm_ref 2
else
- wc -c $f
+ echo $(wc -c $f)
fi
}
do_audio_decoding()
{
- do_avconv $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav
+ 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
}