X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=f2d5db0dfcc21075293c3d9350573aff820410e8;hp=edabd47ca95324a934d81ae9d39b30ecfe65a59f;hb=c1aae90038456a61d0f9313d34e6107c3440d3e7;hpb=e8779db70cfe53db1d9f1f6ad00c4888ccf09b23 diff --git a/src/input/wav.c b/src/input/wav.c index edabd47c..f2d5db0d 100644 --- a/src/input/wav.c +++ b/src/input/wav.c @@ -24,7 +24,7 @@ #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #define LOG_PREFIX "input/wav" @@ -38,11 +38,12 @@ /* 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; int fmt_code; uint64_t samplerate; int samplesize; @@ -57,7 +58,7 @@ static int parse_wav_header(GString *buf, struct context *inc) unsigned int fmt_code, samplesize, num_channels, unitsize; if (buf->len < MIN_DATA_CHUNK_OFFSET) - return SR_OK_CONTINUE; + return SR_ERR_NA; fmt_code = RL16(buf->str + 20); samplerate = RL32(buf->str + 24); @@ -72,17 +73,16 @@ 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_OK_CONTINUE; + return SR_ERR_NA; if (RL16(buf->str + 16) != 40) { sr_err("WAV extensible format chunk must be 40 bytes."); @@ -98,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; } @@ -149,7 +149,8 @@ static int init(struct sr_input *in, GHashTable *options) { (void)options; - in->sdi = sr_dev_inst_new(0, 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; } @@ -159,13 +160,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; @@ -177,42 +177,6 @@ static int find_data_chunk(GString *buf, int initial_offset) return offset; } -static int initial_receive(struct sr_input *in) -{ - struct sr_datafeed_packet packet; - struct sr_datafeed_meta meta; - struct sr_channel *ch; - struct sr_config *src; - struct context *inc; - int ret, i; - char channelname[8]; - - if (!in->buf) - /* Shouldn't happen. */ - return SR_ERR; - - inc = in->priv = g_malloc(sizeof(struct context)); - if ((ret = parse_wav_header(in->buf, inc)) != SR_OK) - return ret; - - 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; - packet.payload = &meta; - 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); - sr_config_free(src); - - return SR_OK; -} - static void send_chunk(const struct sr_input *in, int offset, int num_samples) { struct sr_datafeed_packet packet; @@ -230,7 +194,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) { @@ -269,25 +233,34 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples) sr_session_send(in->sdi, &packet); } -static int receive(const struct sr_input *in, GString *buf) +static int process_buffer(struct sr_input *in) { struct context *inc; - int offset, chunk_samples, total_samples, processed, max_chunk_samples, num_samples, i; - - g_string_append_len(in->buf, buf->str, buf->len); + struct sr_datafeed_packet packet; + struct sr_datafeed_meta meta; + struct sr_config *src; + int offset, chunk_samples, total_samples, processed, max_chunk_samples; + int num_samples, i; + char channelname[8]; - if (!in->priv) { - if (initial_receive((struct sr_input *)in) != SR_OK) - return SR_ERR; - if (in->buf->len < MIN_DATA_CHUNK_OFFSET) { - /* - * Don't even get started until there's enough room - * for the data segment to start. - */ - return SR_OK; + 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); + + packet.type = SR_DF_META; + packet.payload = &meta; + 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); + sr_config_free(src); + + inc->started = TRUE; } - inc = in->priv; if (!inc->found_data) { /* Skip past size of 'fmt ' chunk. */ @@ -331,30 +304,67 @@ static int receive(const 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->priv) { - /* End of stream. */ + if (in->sdi_ready) + ret = process_buffer(in); + else + ret = SR_OK; + + inc = in->priv; + if (inc->started) { packet.type = SR_DF_END; sr_session_send(in->sdi, &packet); - - g_free(in->priv); - in->priv = NULL; } - 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, }; -