X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=66dfce98e84a47f26fcf11827d9072c2e12fad51;hb=5eb39a91f3bb431efcc36f5457be79a1e6239297;hp=9ad6240d73cf2555eeaed95ba43948ed20992ba2;hpb=cbd9e6e987a4427a3ef11c1d12a967d4e6b92943;p=libsigrok.git

diff --git a/src/input/wav.c b/src/input/wav.c
index 9ad6240d..66dfce98 100644
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -24,31 +25,33 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/wav"
 
 /* How many bytes at a time to process and send to the session bus. */
-#define CHUNK_SIZE 4096
+#define CHUNK_SIZE               (1 * 1024 * 1024 * sizeof(float))
 
 /* Minimum size of header + 1 8-bit mono PCM sample. */
 #define MIN_DATA_CHUNK_OFFSET    45
 
 /* Expect to find the "data" chunk within this offset from the start. */
-#define MAX_DATA_CHUNK_OFFSET    256
+#define MAX_DATA_CHUNK_OFFSET    1024
 
-#define WAVE_FORMAT_PCM          0x0001
-#define WAVE_FORMAT_IEEE_FLOAT   0x0003
-#define WAVE_FORMAT_EXTENSIBLE   0xfffe
+#define WAVE_FORMAT_PCM_         0x0001
+#define WAVE_FORMAT_IEEE_FLOAT_  0x0003
+#define WAVE_FORMAT_EXTENSIBLE_  0xfffe
 
 struct context {
+	gboolean started;
 	int fmt_code;
 	uint64_t samplerate;
 	int samplesize;
 	int num_channels;
 	int unitsize;
 	gboolean found_data;
+	gboolean create_channels;
 };
 
 static int parse_wav_header(GString *buf, struct context *inc)
@@ -57,32 +60,31 @@ static int parse_wav_header(GString *buf, struct context *inc)
 	unsigned int fmt_code, samplesize, num_channels, unitsize;
 
 	if (buf->len < MIN_DATA_CHUNK_OFFSET)
-		return SR_ERR;
+		return SR_ERR_NA;
 
 	fmt_code = RL16(buf->str + 20);
 	samplerate = RL32(buf->str + 24);
 
 	samplesize = RL16(buf->str + 32);
-	if (samplesize != 1 && samplesize != 2 && samplesize != 4) {
-		sr_err("Only 8, 16 or 32 bits per sample supported.");
-		return SR_ERR;
-	}
-
 	num_channels = RL16(buf->str + 22);
 	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) {
-	} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT) {
+	if (fmt_code == WAVE_FORMAT_PCM_) {
+	} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT_) {
 		if (unitsize != 4) {
 			sr_err("only 32-bit floats supported.");
-			return SR_ERR;
+			return SR_ERR_DATA;
 		}
-	} else if (fmt_code == WAVE_FORMAT_EXTENSIBLE) {
+	} else if (fmt_code == WAVE_FORMAT_EXTENSIBLE_) {
 		if (buf->len < 70)
 			/* Not enough for extensible header and next chunk. */
-			return SR_OK_CONTINUE;
+			return SR_ERR_NA;
 
 		if (RL16(buf->str + 16) != 40) {
 			sr_err("WAV extensible format chunk must be 40 bytes.");
@@ -94,17 +96,21 @@ static int parse_wav_header(GString *buf, struct context *inc)
 		}
 		if (RL16(buf->str + 34) != RL16(buf->str + 38)) {
 			sr_err("Reduced valid bits per sample not supported.");
-			return SR_ERR;
+			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) {
+		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;
+			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) {
@@ -119,32 +125,41 @@ static int parse_wav_header(GString *buf, struct context *inc)
 	return SR_OK;
 }
 
-static int format_match(GHashTable *metadata)
+static int format_match(GHashTable *metadata, unsigned int *confidence)
 {
 	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;
+
+	*confidence = 1;
 
-	return TRUE;
+	return SR_OK;
 }
 
 static int init(struct sr_input *in, GHashTable *options)
 {
+	struct context *inc;
+
 	(void)options;
 
-	in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
+	in->sdi = g_malloc0(sizeof(struct sr_dev_inst));
+	in->priv = g_malloc0(sizeof(struct context));
+	inc = in->priv;
+
+	inc->create_channels = TRUE;
 
 	return SR_OK;
 }
@@ -154,13 +169,12 @@ static int find_data_chunk(GString *buf, int initial_offset)
 	unsigned int offset, i;
 
 	offset = initial_offset;
-	while(offset < MIN(MAX_DATA_CHUNK_OFFSET, buf->len)) {
+	while (offset < MIN(MAX_DATA_CHUNK_OFFSET, buf->len)) {
 		if (!memcmp(buf->str + offset, "data", 4))
 			/* Skip into the samples. */
 			return offset + 8;
 		for (i = 0; i < 4; i++) {
-			if (!isalpha(buf->str[offset + i])
-					&& !isascii(buf->str[offset + i])
+			if (!isalnum(buf->str[offset + i])
 					&& !isblank(buf->str[offset + i]))
 				/* Doesn't look like a chunk ID. */
 				return -1;
@@ -169,82 +183,51 @@ static int find_data_chunk(GString *buf, int initial_offset)
 		offset += 8 + RL32(buf->str + offset + 4);
 	}
 
-	return offset;
-}
-
-static int initial_receive(struct sr_input *in)
-{
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_meta meta;
-	struct sr_channel *ch;
-	struct sr_config *src;
-	struct context *inc;
-	int i;
-	char channelname[8];
-
-	if (!in->buf)
-		/* Shouldn't happen. */
-		return SR_ERR;
-
-	inc = in->priv = g_malloc(sizeof(struct context));
-	if (parse_wav_header(in->buf, inc) != SR_OK)
-		return SR_ERR;
-
-	for (i = 0; i < inc->num_channels; i++) {
-		snprintf(channelname, 8, "CH%d", i + 1);
-		ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, channelname);
-		in->sdi->channels = g_slist_append(in->sdi->channels, ch);
-	}
-
-	std_session_send_df_header(in->sdi, LOG_PREFIX);
+	if (offset > MAX_DATA_CHUNK_OFFSET)
+		return -1;
 
-	packet.type = SR_DF_META;
-	packet.payload = &meta;
-	src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
-	meta.config = g_slist_append(NULL, src);
-	sr_session_send(in->sdi, &packet);
-	sr_config_free(src);
-
-	return SR_OK;
+	return offset;
 }
 
 static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	struct context *inc;
-	float fdata[CHUNK_SIZE];
-	uint64_t sample;
+	float *fdata;
 	int total_samples, samplenum;
 	char *s, *d;
 
 	inc = in->priv;
 
+	total_samples = num_samples * inc->num_channels;
+	fdata = g_malloc0(total_samples * sizeof(float));
 	s = in->buf->str + offset;
 	d = (char *)fdata;
-	memset(fdata, 0, CHUNK_SIZE);
-	total_samples = num_samples * inc->num_channels;
+
 	for (samplenum = 0; samplenum < total_samples; samplenum++) {
-		if (inc->fmt_code == WAVE_FORMAT_PCM) {
-			sample = 0;
-			memcpy(&sample, s, inc->unitsize);
-			switch (inc->samplesize) {
+		if (inc->fmt_code == WAVE_FORMAT_PCM_) {
+			switch (inc->unitsize) {
 			case 1:
 				/* 8-bit PCM samples are unsigned. */
-				fdata[samplenum] = (uint8_t)sample / (float)255;
+				fdata[samplenum] = *(uint8_t*)(s) / (float)255;
 				break;
 			case 2:
-				fdata[samplenum] = RL16S(&sample) / (float)INT16_MAX;
+				fdata[samplenum] = RL16S(s) / (float)INT16_MAX;
 				break;
 			case 4:
-				fdata[samplenum] = RL32S(&sample) / (float)INT32_MAX;
+				fdata[samplenum] = RL32S(s) / (float)INT32_MAX;
 				break;
 			}
 		} 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
@@ -252,36 +235,44 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 		s += inc->unitsize;
 		d += inc->unitsize;
 	}
+
+	/* TODO: Use proper 'digits' value for this device (and its modes). */
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
 	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
-	analog.channels = in->sdi->channels;
 	analog.num_samples = num_samples;
-	analog.mq = 0;
-	analog.mqflags = 0;
-	analog.unit = 0;
 	analog.data = fdata;
+	analog.meaning->channels = in->sdi->channels;
+	analog.meaning->mq = 0;
+	analog.meaning->mqflags = 0;
+	analog.meaning->unit = 0;
 	sr_session_send(in->sdi, &packet);
+	g_free(fdata);
 }
 
-static int receive(const struct sr_input *in, GString *buf)
+static int process_buffer(struct sr_input *in)
 {
 	struct context *inc;
-	int offset, chunk_samples, total_samples, processed, max_chunk_samples, num_samples, i;
+	struct sr_datafeed_packet packet;
+	struct sr_datafeed_meta meta;
+	struct sr_config *src;
+	int offset, chunk_samples, total_samples, processed, max_chunk_samples;
+	int num_samples, i;
 
-	g_string_append_len(in->buf, buf->str, buf->len);
+	inc = in->priv;
+	if (!inc->started) {
+		std_session_send_df_header(in->sdi);
 
-	if (!in->priv) {
-		if (initial_receive((struct sr_input *)in) != SR_OK)
-			return SR_ERR;
-		if (in->buf->len < MIN_DATA_CHUNK_OFFSET) {
-			/*
-			 * Don't even get started until there's enough room
-			 * for the data segment to start.
-			 */
-			return SR_OK;
-		}
+		packet.type = SR_DF_META;
+		packet.payload = &meta;
+		src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
+		meta.config = g_slist_append(NULL, src);
+		sr_session_send(in->sdi, &packet);
+		g_slist_free(meta.config);
+		sr_config_free(src);
+
+		inc->started = TRUE;
 	}
-	inc = in->priv;
 
 	if (!inc->found_data) {
 		/* Skip past size of 'fmt ' chunk. */
@@ -298,8 +289,8 @@ static int receive(const struct sr_input *in, GString *buf)
 		offset = 0;
 
 	/* Round off up to the last channels * unitsize boundary. */
-	chunk_samples = (in->buf->len - offset) / inc->num_channels / inc->unitsize;
-	max_chunk_samples = CHUNK_SIZE / inc->num_channels / inc->unitsize;
+	chunk_samples = (in->buf->len - offset) / inc->samplesize;
+	max_chunk_samples = CHUNK_SIZE / inc->samplesize;
 	processed = 0;
 	total_samples = chunk_samples;
 	while (processed < total_samples) {
@@ -308,7 +299,7 @@ static int receive(const struct sr_input *in, GString *buf)
 		else
 			num_samples = chunk_samples;
 		send_chunk(in, offset, num_samples);
-		offset += num_samples * inc->unitsize;
+		offset += num_samples * inc->samplesize;
 		chunk_samples -= num_samples;
 		processed += num_samples;
 	}
@@ -325,30 +316,89 @@ static int receive(const struct sr_input *in, GString *buf)
 	return SR_OK;
 }
 
-static int cleanup(struct sr_input *in)
+static int receive(struct sr_input *in, GString *buf)
 {
-	struct sr_datafeed_packet packet;
+	struct context *inc;
+	int ret;
+	char channelname[8];
 
-	if (in->priv) {
-		/* End of stream. */
-		packet.type = SR_DF_END;
-		sr_session_send(in->sdi, &packet);
+	g_string_append_len(in->buf, buf->str, buf->len);
 
-		g_free(in->priv);
-		in->priv = NULL;
+	if (in->buf->len < MIN_DATA_CHUNK_OFFSET) {
+		/*
+		 * Don't even try until there's enough room
+		 * for the data segment to start.
+		 */
+		return SR_OK;
 	}
 
+	inc = in->priv;
+	if (!in->sdi_ready) {
+		if ((ret = parse_wav_header(in->buf, inc)) == SR_ERR_NA)
+			/* Not enough data yet. */
+			return SR_OK;
+		else if (ret != SR_OK)
+			return ret;
+
+		if (inc->create_channels) {
+			for (int i = 0; i < inc->num_channels; i++) {
+				snprintf(channelname, sizeof(channelname), "CH%d", i + 1);
+				sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname);
+			}
+		}
+
+		inc->create_channels = FALSE;
+
+		/* sdi is ready, notify frontend. */
+		in->sdi_ready = TRUE;
+		return SR_OK;
+	}
+
+	ret = process_buffer(in);
+
+	return ret;
+}
+
+static int end(struct sr_input *in)
+{
+	struct context *inc;
+	int ret;
+
+	if (in->sdi_ready)
+		ret = process_buffer(in);
+	else
+		ret = SR_OK;
+
+	inc = in->priv;
+	if (inc->started)
+		std_session_send_df_end(in->sdi);
+
+	return ret;
+}
+
+static int reset(struct sr_input *in)
+{
+	memset(in->priv, 0, sizeof(struct context));
+
+	/*
+	 * We only want to create the sigrok channels once, so
+	 * inc->create_channels won't be set to TRUE this time around.
+	 */
+
+	g_string_truncate(in->buf, 0);
+
 	return SR_OK;
 }
 
 SR_PRIV struct sr_input_module input_wav = {
 	.id = "wav",
 	.name = "WAV",
-	.desc = "WAV file",
+	.desc = "Microsoft WAV file format data",
+	.exts = (const char*[]){"wav", NULL},
 	.metadata = { SR_INPUT_META_HEADER | SR_INPUT_META_REQUIRED },
 	.format_match = format_match,
 	.init = init,
 	.receive = receive,
-	.cleanup = cleanup,
+	.end = end,
+	.reset = reset,
 };
-