From 8b5aefc681c1d4158ce4c0c95f2a2888ea274a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Tue, 24 Nov 2015 21:03:04 +0100 Subject: [PATCH] input/wav: fix and simplify conversion of integer samples Size of individual samples is specified by unitsize, not samplesize. The sample immediate is not necessary. --- src/input/wav.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/input/wav.c b/src/input/wav.c index e04a0016..f16db3a3 100644 --- a/src/input/wav.c +++ b/src/input/wav.c @@ -187,7 +187,6 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples) struct sr_datafeed_analog_old analog; struct context *inc; float fdata[CHUNK_SIZE]; - uint64_t sample; int total_samples, samplenum; char *s, *d; @@ -199,18 +198,16 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples) 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 {