X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=a1751243f467729c8ee7b2dbc61f3ca753906fc9;hb=0b7c07850cc6f1c80eb60d3f4429416858f38950;hp=d1299cd3376671dfcd1a12a2cc8310476880b821;hpb=288f8ce23cf0cf9a66e0ffe824f693009f942d07;p=libsigrok.git

diff --git a/src/input/wav.c b/src/input/wav.c
index d1299cd3..a1751243 100644
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -31,13 +31,13 @@
 #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               4096
 
 /* 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
@@ -175,16 +175,21 @@ static int find_data_chunk(GString *buf, int initial_offset)
 		offset += 8 + RL32(buf->str + offset + 4);
 	}
 
+	if (offset > MAX_DATA_CHUNK_OFFSET)
+		return -1;
+
 	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_old analog;
+	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;
 	int total_samples, samplenum;
 	char *s, *d;
 
@@ -192,22 +197,20 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 
 	s = in->buf->str + offset;
 	d = (char *)fdata;
-	memset(fdata, 0, CHUNK_SIZE);
+	memset(fdata, 0, CHUNK_SIZE * sizeof(float));
 	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) {
+			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 {
@@ -223,14 +226,17 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 		s += inc->unitsize;
 		d += inc->unitsize;
 	}
-	packet.type = SR_DF_ANALOG_OLD;
+
+	/* 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);
 }
 
@@ -242,16 +248,10 @@ static int process_buffer(struct sr_input *in)
 	struct sr_config *src;
 	int offset, chunk_samples, total_samples, processed, max_chunk_samples;
 	int num_samples, i;
-	char channelname[8];
 
 	inc = in->priv;
 	if (!inc->started) {
-		for (i = 0; i < inc->num_channels; i++) {
-			snprintf(channelname, 8, "CH%d", i + 1);
-			sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname);
-		}
-
-		std_session_send_df_header(in->sdi, LOG_PREFIX);
+		std_session_send_df_header(in->sdi);
 
 		packet.type = SR_DF_META;
 		packet.payload = &meta;
@@ -310,6 +310,7 @@ static int receive(struct sr_input *in, GString *buf)
 {
 	struct context *inc;
 	int ret;
+	char channelname[8];
 
 	g_string_append_len(in->buf, buf->str, buf->len);
 
@@ -329,6 +330,11 @@ static int receive(struct sr_input *in, GString *buf)
 		else if (ret != SR_OK)
 			return ret;
 
+		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);
+		}
+
 		/* sdi is ready, notify frontend. */
 		in->sdi_ready = TRUE;
 		return SR_OK;
@@ -341,7 +347,6 @@ static int receive(struct sr_input *in, GString *buf)
 
 static int end(struct sr_input *in)
 {
-	struct sr_datafeed_packet packet;
 	struct context *inc;
 	int ret;
 
@@ -351,14 +356,22 @@ static int end(struct sr_input *in)
 		ret = SR_OK;
 
 	inc = in->priv;
-	if (inc->started) {
-		packet.type = SR_DF_END;
-		sr_session_send(in->sdi, &packet);
-	}
+	if (inc->started)
+		std_session_send_df_end(in->sdi);
 
 	return ret;
 }
 
+static int reset(struct sr_input *in)
+{
+	struct context *inc = in->priv;
+
+	inc->started = FALSE;
+	g_string_truncate(in->buf, 0);
+
+	return SR_OK;
+}
+
 SR_PRIV struct sr_input_module input_wav = {
 	.id = "wav",
 	.name = "WAV",
@@ -369,4 +382,5 @@ SR_PRIV struct sr_input_module input_wav = {
 	.init = init,
 	.receive = receive,
 	.end = end,
+	.reset = reset,
 };