Menu
▾
▴
[Sox-commits] sox/src sphere.c, 1.51, 1.52 tests.sh, 1.59, 1.60 intermediate1_44100_-u_-b_Wav_-N.sb, 1.1, NONE intermediate1_44100_-u_-b_Wav_-X.sb, 1.1, NONE intermediate1_44100_-u_-b_Wav_-X_-N.sb, 1.1, NONE intermediate1_44100_-u_-b_Wav_.sb, 1.1, NONE
Update of /cvsroot/sox/sox/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11456 Modified Files: sphere.c tests.sh Removed Files: intermediate1_44100_-u_-b_Wav_-N.sb intermediate1_44100_-u_-b_Wav_-X.sb intermediate1_44100_-u_-b_Wav_-X_-N.sb intermediate1_44100_-u_-b_Wav_.sb Log Message: tests update --- intermediate1_44100_-u_-b_Wav_-X.sb DELETED --- Index: tests.sh =================================================================== RCS file: /cvsroot/sox/sox/src/tests.sh,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- tests.sh 16 Mar 2008 07:52:57 -0000 1.59 +++ tests.sh 16 Mar 2008 16:44:40 -0000 1.60 @@ -10,8 +10,13 @@ # installed sox. while [ $# -ne 0 ]; do case "$1" in + -e) + echo=$1 + ;; + -V) verbose=$1 + echo=$1 ;; -a) # Perform each test up to 3 times with different #s of @@ -55,24 +60,19 @@ getFormat () { formatExt=$1; formatText=$1; formatFlags="" case $1 in - al ) formatText="alaw byte" ;; - s1 ) formatText="signed byte" ;; - s4 ) formatText="signed long" ;; - s2 ) formatText="signed word" ;; - ul ) formatText="ulaw byte" ;; - u1 ) formatText="unsigned byte" ;; - u2 ) formatText="unsigned word" ;; - raw) formatText="float"; formatFlags="-f -4" ;; - Raw) formatText="double"; formatFlags="-f -8" ;; - wav1u) formatFlags="-1 -u"; formatExt="wav" ;; - s1X ) formatText="signed byte (swap bits)"; formatExt="s1"; formatFlags="-X" ;; - s1N ) formatText="signed byte (swap nibbles)"; formatExt="s1"; formatFlags="-N" ;; - s1XN ) formatText="signed byte (swap nibbles and bits)"; formatExt="s1"; formatFlags="-X -N" ;; + al ) formatText="alaw" ;; + ul ) formatText="ulaw" ;; + raw) formatText="float"; formatFlags="-f -4" ;; + Raw) formatText="double"; formatFlags="-f -8" ;; + wavu1)formatText="u1 in wav"; formatFlags="-u -1"; formatExt="wav" ;; + s1X ) formatText="s1 (swap bits)"; formatExt="s1"; formatFlags="-X" ;; + s1N ) formatText="s1 (swap nibbles)"; formatExt="s1"; formatFlags="-N" ;; + s1XN) formatText="s1 (swap nibbles & bits)"; formatExt="s1"; formatFlags="-X -N" ;; esac } execute() { - if [ "${verbose}x" != "x" ] ; then + if [ "${echo}x" != "x" ] ; then echo $* fi cmd=$1 @@ -92,7 +92,7 @@ execute ${bindir}/sox $verbose -R -r $rate -c $channels -n $format1Flags input.$format1Ext synth $samples's' sin 300-3300 noise trapezium execute ${bindir}/sox $verbose -R -r $rate -c $channels $format1Flags input.$format1Ext $format2Flags intermediate.$format2Ext execute ${bindir}/sox $verbose -R -r $rate -c $channels $format2Flags intermediate.$format2Ext $format1Flags output.$format1Ext - intermediateReference=intermediate`echo "$channels $rate $format1Flags $format1Ext $format2Flags"|tr " " "_"`.$format2Ext + intermediateReference=vectors/intermediate`echo "$channels $rate $format1Flags $format1Ext $format2Flags"|tr " " "_"`.$format2Ext # Uncomment to generate new reference files # N.B. new reference files must be manually checked for correctness @@ -105,6 +105,7 @@ echo "*FAIL* channels=$channels \"$format1Text\" ---> \"$format2Text\"." exit 1 # This allows failure inspection. fi + vectors=$(expr $vectors + 1) fi if execute cmp -s input.$format1Ext output.$format1Ext @@ -128,23 +129,23 @@ convertToAndFrom s2 u2 s3 u3 s4 u4 raw Raw dat au wav aiff aifc flac caf sph format1=u3 - convertToAndFrom s3 u3 s4 u4 raw Raw wav aiff aifc flac # FIXME: sph + convertToAndFrom s3 u3 s4 u4 raw Raw wav aiff aifc flac sph format1=s4 convertToAndFrom s4 u4 Raw wav aiff aifc caf sph format1=al - convertToAndFrom al s2 u2 s4 raw Raw dat aiff aifc flac caf # FIXME: sph + convertToAndFrom al s2 u2 s4 raw Raw dat aiff aifc flac caf format1=ul convertToAndFrom ul s2 u2 s4 raw Raw dat aiff aifc flac caf sph - format1=wav1u - convertToAndFrom wav1u aiff aifc au dat sf flac caf sph + format1=wavu1 + convertToAndFrom wavu1 aiff aifc au dat sf flac caf sph } do_twochannel_formats () { - format1=wav1u + format1=wavu1 convertToAndFrom avr maud (rate=8000; convertToAndFrom voc) || exit 1 # Fixed rate (samples=23492; convertToAndFrom 8svx) || exit 1 # Even number of samples only @@ -152,12 +153,12 @@ do_singlechannel_formats () { format1=vox - convertToAndFrom vox s2 u2 s3 u3 s4 u4 raw Raw dat au wav aiff aifc flac caf # FIXME: ima + convertToAndFrom vox s2 u2 s3 u3 s4 u4 raw Raw dat au wav aiff aifc flac caf format1=ima - convertToAndFrom ima s2 u2 s3 u3 s4 u4 raw Raw dat au aiff aifc flac caf # FIXME: vox wav + convertToAndFrom ima s2 u2 s3 u3 s4 u4 raw Raw dat au aiff aifc flac caf # FIXME: wav - format1=wav1u + format1=wavu1 convertToAndFrom smp s1 s1X s1N s1XN sndt sndr #(rate=50000; convertToAndFrom txw) || exit 1 # FIXME (rate=11025; convertToAndFrom hcom) || exit 1 # Fixed rates @@ -197,6 +198,8 @@ ${bindir}/sox --help|grep "^AUDIO FILE.*\<flac\>">/dev/null || skip="flac $skip" ${bindir}/sox --help|grep "^AUDIO FILE.*\<caf\>" >/dev/null || skip="caf $skip" +vectors=0 + rate=44100 samples=23493 @@ -236,6 +239,8 @@ fi rm output.u1 +echo "Checked $vectors vectors" + channels=2 samples=10000000 timeIO s1 u1 s2 u2 s3 u3 s4 u4 raw Raw au wav aiff aifc caf sph # FIXME?: flac dat Index: sphere.c =================================================================== RCS file: /cvsroot/sox/sox/src/sphere.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- sphere.c 16 Mar 2008 15:13:51 -0000 1.51 +++ sphere.c 16 Mar 2008 16:44:40 -0000 1.52 @@ -94,7 +94,7 @@ bytes_per_sample = encoding == SOX_ENCODING_ULAW? 1 : 2; if (encoding == SOX_ENCODING_SIGN2 && bytes_per_sample == 1) - ft->encoding.encoding = SOX_ENCODING_UNSIGNED; + encoding = SOX_ENCODING_UNSIGNED; while (header_size) { bytes_read = sox_readbuf(ft, buf, header_size); --- intermediate1_44100_-u_-b_Wav_-N.sb DELETED --- --- intermediate1_44100_-u_-b_Wav_.sb DELETED --- --- intermediate1_44100_-u_-b_Wav_-X_-N.sb DELETED --- |
