X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=check_wav.c;h=48a204bb598c1f9ebc873b10d64704eb256cc2de;hb=b6ea5414d0bafa13f4751b95d3940ae5fe6c07b9;hp=cb39eb540dafae31733623625bf31474c463a243;hpb=3678d4585314f65927935b7ea42b6231630a86e8;p=paraslash.git

diff --git a/check_wav.c b/check_wav.c
index cb39eb54..48a204bb 100644
--- a/check_wav.c
+++ b/check_wav.c
@@ -127,7 +127,7 @@ int check_wav_post_monitor(struct check_wav_context *cwc)
 	unsigned char *a;
 	size_t sz;
 	int ret;
-	uint16_t bps; /* bits per sample */
+	uint16_t format_code, bps; /* bits per sample */
 	const char *sample_formats[] = {SAMPLE_FORMATS};
 
 	if (!btrn)
@@ -157,13 +157,24 @@ int check_wav_post_monitor(struct check_wav_context *cwc)
 	cwc->state = CWS_HAVE_HEADER;
 	/* Only set those values which have not already been set. */
 	cwc->channels = a[22];
+	format_code = read_u16(a + 20);
+	if (format_code != 1 && format_code != 3) {
+		cwc->state = CWS_NO_HEADER;
+		goto out;
+	}
 	cwc->sample_rate = read_u32(a + 24);
 	bps = read_u16(a + 34);
-	if (bps != 8 && bps != 16) {
+	if (bps != 8 && bps != 16 && bps != 32) {
 		PARA_WARNING_LOG("%u bps not supported, assuming 16\n",
 			bps);
 		bps = 16;
 	}
+	if ((bps < 32 && format_code != 1) || (bps == 32 && format_code != 3)) {
+		PARA_WARNING_LOG("invalid bps/format_code (%u/%u)\n",
+			bps, format_code);
+		cwc->state = CWS_NO_HEADER;
+		goto out;
+	}
 	/*
 	 * 8-bit samples are stored as unsigned bytes, ranging from 0
 	 * to 255.  16-bit samples are stored as 2's-complement signed
@@ -171,9 +182,12 @@ int check_wav_post_monitor(struct check_wav_context *cwc)
 	 */
 	if (bps == 8)
 		cwc->sample_format = SF_U8;
-	else
+	else if (bps == 16)
 		cwc->sample_format = (a[3] == 'F')?
 			SF_S16_LE : SF_S16_BE;
+	else /* 32 bit */
+		cwc->sample_format = (a[3] == 'F')?
+			SF_FLOAT_LE : SF_FLOAT_BE;
 	PARA_NOTICE_LOG("%uHz, %s, %s\n", cwc->sample_rate,
 		cwc->channels == 1? "mono" : "stereo",
 		sample_formats[cwc->sample_format]);