X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=271bacef19b9162aed32ab396a347579cbcee87b;hb=55462b8ba9f48931de9b9a7bfbc182a1d113b3b5;hp=9eb5627f2ba49fbbf3c80b91ef575cd6fbeb20eb;hpb=89da5b3b54d3b87bff49e716c4d2b36080fe7a07;p=libsigrok.git

diff --git a/src/input/wav.c b/src/input/wav.c
index 9eb5627f..271bacef 100644
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -38,9 +38,9 @@
 /* Expect to find the "data" chunk within this offset from the start. */
 #define MAX_DATA_CHUNK_OFFSET    256
 
-#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;
@@ -73,14 +73,13 @@ static int parse_wav_header(GString *buf, struct context *inc)
 		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_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_ERR_NA;
@@ -99,11 +98,11 @@ static int parse_wav_header(GString *buf, struct context *inc)
 		}
 		/* 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_DATA;
 		}
-		if (fmt_code == WAVE_FORMAT_IEEE_FLOAT && unitsize != 4) {
+		if (fmt_code == WAVE_FORMAT_IEEE_FLOAT_ && unitsize != 4) {
 			sr_err("only 32-bit floats supported.");
 			return SR_ERR_DATA;
 		}
@@ -150,7 +149,7 @@ static int init(struct sr_input *in, GHashTable *options)
 {
 	(void)options;
 
-	in->sdi = sr_dev_inst_new(SR_ST_ACTIVE, NULL, NULL, NULL);
+	in->sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	in->priv = g_malloc0(sizeof(struct context));
 
 	return SR_OK;
@@ -161,7 +160,7 @@ 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;
@@ -196,7 +195,7 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 	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) {
+		if (inc->fmt_code == WAVE_FORMAT_PCM_) {
 			sample = 0;
 			memcpy(&sample, s, inc->unitsize);
 			switch (inc->samplesize) {
@@ -235,45 +234,21 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 	sr_session_send(in->sdi, &packet);
 }
 
-static int receive(struct sr_input *in, GString *buf)
+static int process_buffer(struct sr_input *in)
 {
+	struct context *inc;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_meta meta;
-	struct sr_channel *ch;
 	struct sr_config *src;
-	struct context *inc;
 	int offset, chunk_samples, total_samples, processed, max_chunk_samples;
-	int num_samples, ret, i;
+	int num_samples, i;
 	char channelname[8];
 
-	g_string_append_len(in->buf, buf->str, buf->len);
-
-	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;
-
-		/* sdi is ready, notify frontend. */
-		in->sdi_ready = TRUE;
-		return SR_OK;
-	}
-
 	if (!inc->started) {
 		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);
+			sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname);
 		}
 
 		std_session_send_df_header(in->sdi, LOG_PREFIX);
@@ -330,29 +305,67 @@ static int receive(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 context *inc;
+	int ret;
+
+	g_string_append_len(in->buf, buf->str, buf->len);
+
+	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;
+
+		/* 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 sr_datafeed_packet packet;
 	struct context *inc;
+	int ret;
+
+	if (in->sdi_ready)
+		ret = process_buffer(in);
+	else
+		ret = SR_OK;
 
 	inc = in->priv;
 	if (inc->started) {
-		/* End of stream. */
 		packet.type = SR_DF_END;
 		sr_session_send(in->sdi, &packet);
 	}
 
-	return SR_OK;
+	return ret;
 }
 
 SR_PRIV struct sr_input_module input_wav = {
 	.id = "wav",
 	.name = "WAV",
 	.desc = "WAV file",
+	.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,
 };
-