X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fwav.c;h=732fe976f0df420c2cae8b8e4b9a935ca0201b45;hb=HEAD;hp=e01f3afdea53bb9fc4dfdc7d3d71a934eea76268;hpb=1685c27619b7c8c9041476d0db437081ac892d4f;p=libsigrok.git

diff --git a/src/output/wav.c b/src/output/wav.c
index e01f3afd..732fe976 100644
--- a/src/output/wav.c
+++ b/src/output/wav.c
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/wav"
@@ -35,6 +36,7 @@ struct out_context {
 	int chanbuf_size;
 	int *chanbuf_used;
 	uint8_t **chanbuf;
+	float *fdata;
 };
 
 static int realloc_chanbufs(const struct sr_output *o, int size)
@@ -44,7 +46,7 @@ static int realloc_chanbufs(const struct sr_output *o, int size)
 
 	outc = o->priv;
 	for (i = 0; i < outc->num_channels; i++) {
-		if (!(outc->chanbuf[i] = g_try_realloc(outc->chanbuf[i], sizeof(float) * size))) { 
+		if (!(outc->chanbuf[i] = g_try_realloc(outc->chanbuf[i], sizeof(float) * size))) {
 			sr_err("Unable to allocate enough output buffer memory.");
 			return SR_ERR;
 		}
@@ -184,9 +186,9 @@ static GString *gen_header(const struct sr_output *o)
  */
 static void float_to_le(uint8_t *buf, float value)
 {
-	char *old;
+	uint8_t *old;
 
-	old = (char *)&value;
+	old = (uint8_t *)&value;
 #ifdef WORDS_BIGENDIAN
 	buf[0] = old[3];
 	buf[1] = old[2];
@@ -217,9 +219,10 @@ static int check_chanbuf_size(const struct sr_output *o)
 				/* Nothing in all the buffers yet. */
 				size = -1;
 				break;
-			} else
+			} else {
 				/* New high water mark. */
 				size = outc->chanbuf_used[i];
+			}
 		} else if (outc->chanbuf_used[i] != size) {
 			/* All channel buffers are not equally full yet. */
 			size = -1;
@@ -239,8 +242,10 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 	const struct sr_config *src;
 	struct sr_channel *ch;
 	GSList *l;
+	const GSList *channels;
 	float f;
-	int num_channels, size, *chan_idx, idx, i, j;
+	int num_channels, num_samples, size, *chan_idx, idx, i, j, ret;
+	float *data;
 	uint8_t *buf;
 
 	*out = NULL;
@@ -261,21 +266,31 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 		if (!outc->header_done) {
 			*out = gen_header(o);
 			outc->header_done = TRUE;
-		} else
+		} else {
 			*out = g_string_sized_new(512);
+		}
 
 		analog = packet->payload;
-		if (analog->num_samples == 0)
+		num_samples = analog->num_samples;
+		channels = analog->meaning->channels;
+		num_channels = g_slist_length(analog->meaning->channels);
+		if (!(data = g_try_realloc(outc->fdata, sizeof(float) * num_samples * num_channels)))
+			return SR_ERR_MALLOC;
+		outc->fdata = data;
+		ret = sr_analog_to_float(analog, data);
+		if (ret != SR_OK)
+			return ret;
+
+		if (num_samples == 0)
 			return SR_OK;
 
-		num_channels = g_slist_length(analog->channels);
 		if (num_channels > outc->num_channels) {
 			sr_err("Packet has %d channels, but only %d were enabled.",
 					num_channels, outc->num_channels);
 			return SR_ERR;
 		}
 
-		if (analog->num_samples > outc->chanbuf_size) {
+		if (num_samples > outc->chanbuf_size) {
 			if (realloc_chanbufs(o, analog->num_samples) != SR_OK)
 				return SR_ERR_MALLOC;
 		}
@@ -283,16 +298,16 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 		/* Index the channels in this packet, so we can interleave quicker. */
 		chan_idx = g_malloc(sizeof(int) * outc->num_channels);
 		for (i = 0; i < num_channels; i++) {
-			ch = g_slist_nth_data(analog->channels, i);
+			ch = g_slist_nth_data((GSList *) channels, i);
 			chan_idx[i] = g_slist_index(outc->channels, ch);
 		}
 
-		for (i = 0; i < analog->num_samples; i++) {
+		for (i = 0; i < num_samples; i++) {
 			for (j = 0; j < num_channels; j++) {
 				idx = chan_idx[j];
 				buf = outc->chanbuf[idx] + outc->chanbuf_used[idx]++ * 4;
-				f = analog->data[i * num_channels + j];
-				if (outc->scale != 0.0)
+				f = data[i * num_channels + j];
+				if (outc->scale != 1.0)
 					f /= outc->scale;
 				float_to_le(buf, f);
 			}
@@ -317,6 +332,19 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 	return SR_OK;
 }
 
+static struct sr_option options[] = {
+	{ "scale", "Scale", "Scale values by factor", NULL, NULL },
+	ALL_ZERO
+};
+
+static const struct sr_option *get_options(void)
+{
+	if (!options[0].def)
+		options[0].def = g_variant_ref_sink(g_variant_new_double(1.0));
+
+	return options;
+}
+
 static int cleanup(struct sr_output *o)
 {
 	struct out_context *outc;
@@ -324,36 +352,26 @@ static int cleanup(struct sr_output *o)
 
 	outc = o->priv;
 	g_slist_free(outc->channels);
+	g_variant_unref(options[0].def);
 	for (i = 0; i < outc->num_channels; i++)
 		g_free(outc->chanbuf[i]);
 	g_free(outc->chanbuf_used);
 	g_free(outc->chanbuf);
+	g_free(outc->fdata);
 	g_free(outc);
 	o->priv = NULL;
 
 	return SR_OK;
 }
 
-static struct sr_option options[] = {
-	{ "scale", "Scale", "Scale values by factor", NULL, NULL },
-	ALL_ZERO
-};
-
-static const struct sr_option *get_options(void)
-{
-	if (!options[0].def)
-		options[0].def = g_variant_ref_sink(g_variant_new_double(0.0));
-
-	return options;
-}
-
 SR_PRIV struct sr_output_module output_wav = {
 	.id = "wav",
 	.name = "WAV",
-	.desc = "WAVE file format",
+	.desc = "Microsoft WAV file format data",
+	.exts = (const char*[]){"wav", NULL},
+	.flags = 0,
 	.options = get_options,
 	.init = init,
 	.receive = receive,
 	.cleanup = cleanup,
 };
-