X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=4f36e8c45126aac8791a55ddef31563bab0db2cc;hb=HEAD;hp=d1299cd3376671dfcd1a12a2cc8310476880b821;hpb=288f8ce23cf0cf9a66e0ffe824f693009f942d07;p=libsigrok.git diff --git a/src/input/wav.c b/src/input/wav.c index d1299cd3..0675ec8f 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 (1 * 1024 * 1024 * sizeof(float)) /* 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 @@ -51,6 +51,7 @@ struct context { int num_channels; int unitsize; gboolean found_data; + GSList *prev_sr_channels; }; static int parse_wav_header(GString *buf, struct context *inc) @@ -124,7 +125,7 @@ static int parse_wav_header(GString *buf, struct context *inc) return SR_OK; } -static int format_match(GHashTable *metadata) +static int format_match(GHashTable *metadata, unsigned int *confidence) { GString *buf; int ret; @@ -143,6 +144,8 @@ static int format_match(GHashTable *metadata) if ((ret = parse_wav_header(buf, NULL)) != SR_OK) return ret; + *confidence = 1; + return SR_OK; } @@ -175,39 +178,43 @@ 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; + float *fdata; int total_samples, samplenum; char *s, *d; inc = in->priv; + total_samples = num_samples * inc->num_channels; + fdata = g_malloc0(total_samples * sizeof(float)); s = in->buf->str + offset; d = (char *)fdata; - 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) { + 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,44 +230,32 @@ 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); + g_free(fdata); } static int process_buffer(struct sr_input *in) { struct context *inc; - 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]; 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); - g_slist_free(meta.config); - sr_config_free(src); - + std_session_send_df_header(in->sdi); + (void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE, + g_variant_new_uint64(inc->samplerate)); inc->started = TRUE; } @@ -306,10 +301,49 @@ static int process_buffer(struct sr_input *in) return SR_OK; } +/* + * Check the channel list for consistency across file re-import. See + * the VCD input module for more details and motivation. + */ + +static void keep_header_for_reread(const struct sr_input *in) +{ + struct context *inc; + + inc = in->priv; + g_slist_free_full(inc->prev_sr_channels, sr_channel_free_cb); + inc->prev_sr_channels = in->sdi->channels; + in->sdi->channels = NULL; +} + +static int check_header_in_reread(const struct sr_input *in) +{ + struct context *inc; + + if (!in) + return FALSE; + inc = in->priv; + if (!inc) + return FALSE; + if (!inc->prev_sr_channels) + return TRUE; + + if (sr_channel_lists_differ(inc->prev_sr_channels, in->sdi->channels)) { + sr_err("Channel list change not supported for file re-read."); + return FALSE; + } + g_slist_free_full(in->sdi->channels, sr_channel_free_cb); + in->sdi->channels = inc->prev_sr_channels; + inc->prev_sr_channels = NULL; + + return TRUE; +} + static int receive(struct sr_input *in, GString *buf) { struct context *inc; int ret; + char channelname[16]; g_string_append_len(in->buf, buf->str, buf->len); @@ -329,6 +363,13 @@ 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); + } + if (!check_header_in_reread(in)) + return SR_ERR_DATA; + /* sdi is ready, notify frontend. */ in->sdi_ready = TRUE; return SR_OK; @@ -341,7 +382,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,22 +391,41 @@ 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; + + inc = in->priv; + memset(inc, 0, sizeof(*inc)); + + /* + * Create, and re-create channels for every iteration of file + * import. Other logic will enforce a consistent set of channels + * across re-import, or an appropriate error message when file + * properties should change. + */ + keep_header_for_reread(in); + + g_string_truncate(in->buf, 0); + + return SR_OK; +} + SR_PRIV struct sr_input_module input_wav = { .id = "wav", .name = "WAV", - .desc = "WAV file", + .desc = "Microsoft WAV file format data", .exts = (const char*[]){"wav", NULL}, .metadata = { SR_INPUT_META_HEADER | SR_INPUT_META_REQUIRED }, .format_match = format_match, .init = init, .receive = receive, .end = end, + .reset = reset, };