X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=edabd47ca95324a934d81ae9d39b30ecfe65a59f;hb=cac58676e987d06b890366ac4078a1e4fb1cbdc3;hp=05b43ba4f26297538c15f1178683113aaca48802;hpb=962d43440a95f67d365f7e8174b2af89c34bae9a;p=libsigrok.git

diff --git a/src/input/wav.c b/src/input/wav.c
index 05b43ba4..edabd47c 100644
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -38,8 +38,9 @@
 /* Expect to find the "data" chunk within this offset from the start. */
 #define MAX_DATA_CHUNK_OFFSET    256
 
-#define WAVE_FORMAT_PCM          1
-#define WAVE_FORMAT_IEEE_FLOAT   3
+#define WAVE_FORMAT_PCM          0x0001
+#define WAVE_FORMAT_IEEE_FLOAT   0x0003
+#define WAVE_FORMAT_EXTENSIBLE   0xfffe
 
 struct context {
 	int fmt_code;
@@ -53,32 +54,61 @@ struct context {
 static int parse_wav_header(GString *buf, struct context *inc)
 {
 	uint64_t samplerate;
-	int fmt_code, samplesize, num_channels, unitsize;
+	unsigned int fmt_code, samplesize, num_channels, unitsize;
 
-	if (buf->len < MIN_DATA_CHUNK_OFFSET) {
-		return SR_ERR;
-	}
+	if (buf->len < MIN_DATA_CHUNK_OFFSET)
+		return SR_OK_CONTINUE;
 
 	fmt_code = RL16(buf->str + 20);
 	samplerate = RL32(buf->str + 24);
+
 	samplesize = RL16(buf->str + 32);
 	num_channels = RL16(buf->str + 22);
-	/* TODO div0 */
+	if (num_channels == 0)
+		return SR_ERR;
 	unitsize = samplesize / num_channels;
+	if (unitsize != 1 && unitsize != 2 && unitsize != 4) {
+		sr_err("Only 8, 16 or 32 bits per sample supported.");
+		return SR_ERR_DATA;
+	}
+
 
 	if (fmt_code == WAVE_FORMAT_PCM) {
-		if (samplesize != 1 && samplesize != 2 && samplesize != 4) {
-			sr_err("only 8, 16 or 32 bits per sample supported.");
-			return SR_ERR;
-		}
 	} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT) {
 		if (unitsize != 4) {
 			sr_err("only 32-bit floats supported.");
+			return SR_ERR_DATA;
+		}
+	} else if (fmt_code == WAVE_FORMAT_EXTENSIBLE) {
+		if (buf->len < 70)
+			/* Not enough for extensible header and next chunk. */
+			return SR_OK_CONTINUE;
+
+		if (RL16(buf->str + 16) != 40) {
+			sr_err("WAV extensible format chunk must be 40 bytes.");
+			return SR_ERR;
+		}
+		if (RL16(buf->str + 36) != 22) {
+			sr_err("WAV extension must be 22 bytes.");
 			return SR_ERR;
 		}
+		if (RL16(buf->str + 34) != RL16(buf->str + 38)) {
+			sr_err("Reduced valid bits per sample not supported.");
+			return SR_ERR_DATA;
+		}
+		/* Real format code is the first two bytes of the GUID. */
+		fmt_code = RL16(buf->str + 44);
+		if (fmt_code != WAVE_FORMAT_PCM && fmt_code != WAVE_FORMAT_IEEE_FLOAT) {
+			sr_err("Only PCM and floating point samples are supported.");
+			return SR_ERR_DATA;
+		}
+		if (fmt_code == WAVE_FORMAT_IEEE_FLOAT && unitsize != 4) {
+			sr_err("only 32-bit floats supported.");
+			return SR_ERR_DATA;
+		}
 	} else {
 		sr_err("Only PCM and floating point samples are supported.");
-		return SR_ERR;
+		return SR_ERR_DATA;
 	}
 
 	if (inc) {
@@ -96,22 +126,23 @@ static int parse_wav_header(GString *buf, struct context *inc)
 static int format_match(GHashTable *metadata)
 {
 	GString *buf;
+	int ret;
 
 	buf = g_hash_table_lookup(metadata, GINT_TO_POINTER(SR_INPUT_META_HEADER));
 	if (strncmp(buf->str, "RIFF", 4))
-		return FALSE;
+		return SR_ERR;
 	if (strncmp(buf->str + 8, "WAVE", 4))
-		return FALSE;
+		return SR_ERR;
 	if (strncmp(buf->str + 12, "fmt ", 4))
-		return FALSE;
+		return SR_ERR;
 	/*
 	 * Only gets called when we already know this is a WAV file, so
 	 * this parser can log error messages.
 	 */
-	if (parse_wav_header(buf, NULL) != SR_OK)
-		return FALSE;
+	if ((ret = parse_wav_header(buf, NULL)) != SR_OK)
+		return ret;
 
-	return TRUE;
+	return SR_OK;
 }
 
 static int init(struct sr_input *in, GHashTable *options)
@@ -153,7 +184,7 @@ static int initial_receive(struct sr_input *in)
 	struct sr_channel *ch;
 	struct sr_config *src;
 	struct context *inc;
-	int i;
+	int ret, i;
 	char channelname[8];
 
 	if (!in->buf)
@@ -161,8 +192,8 @@ static int initial_receive(struct sr_input *in)
 		return SR_ERR;
 
 	inc = in->priv = g_malloc(sizeof(struct context));
-	if (parse_wav_header(in->buf, inc) != SR_OK)
-		return SR_ERR;
+	if ((ret = parse_wav_header(in->buf, inc)) != SR_OK)
+		return ret;
 
 	for (i = 0; i < inc->num_channels; i++) {
 		snprintf(channelname, 8, "CH%d", i + 1);
@@ -217,8 +248,9 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 		} else {
 			/* BINARY32 float */
 #ifdef WORDS_BIGENDIAN
+			int i;
 			for (i = 0; i < inc->unitsize; i++)
-				d[i] = s[inc->unitsize - i];
+				d[i] = s[inc->unitsize - 1 - i];
 #else
 			memcpy(d, s, inc->unitsize);
 #endif