X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=a887fb743396e57ae83d3ecfd1707f83a0b76c89;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=8f8a37101200d49488596d7e914d7e8bbd490ad3;hpb=0af636bed97c174bea46e61e961eaa1b0b162e0f;p=libsigrok.git
diff --git a/src/input/wav.c b/src/input/wav.c
index 8f8a3710..a887fb74 100644
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -24,7 +25,7 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "input/wav"
@@ -36,11 +37,11 @@
#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;
@@ -73,14 +74,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 +99,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 +150,7 @@ static int init(struct sr_input *in, GHashTable *options)
{
(void)options;
- in->sdi = sr_dev_inst_new();
+ in->sdi = g_malloc0(sizeof(struct sr_dev_inst));
in->priv = g_malloc0(sizeof(struct context));
return SR_OK;
@@ -161,13 +161,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;
@@ -176,16 +175,18 @@ 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 analog;
+ struct sr_datafeed_analog_old analog;
struct context *inc;
float fdata[CHUNK_SIZE];
- uint64_t sample;
int total_samples, samplenum;
char *s, *d;
@@ -196,19 +197,17 @@ 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) {
- 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 {
@@ -224,7 +223,7 @@ 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;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
analog.channels = in->sdi->channels;
analog.num_samples = num_samples;
@@ -240,20 +239,12 @@ 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;
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);
- 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);
packet.type = SR_DF_META;
@@ -261,6 +252,7 @@ static int process_buffer(struct sr_input *in)
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;
@@ -281,8 +273,8 @@ static int process_buffer(struct sr_input *in)
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) {
@@ -291,7 +283,7 @@ static int process_buffer(struct sr_input *in)
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;
}
@@ -312,6 +304,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);
@@ -331,6 +324,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, 8, "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;
@@ -343,7 +341,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;
@@ -353,10 +350,8 @@ 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, LOG_PREFIX);
return ret;
}
@@ -365,10 +360,10 @@ 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,
.end = end,
};
-