output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / input / wav.c

diff --git a/src/input/wav.c b/src/input/wav.c
index a1751243f467729c8ee7b2dbc61f3ca753906fc9..0675ec8f4088216d8cdf572ce168f60b5f25c0ad 100644 (file)
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -31,7 +31,7 @@
 #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
@@ -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;
 }
 
@@ -189,16 +192,17 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
        struct sr_analog_meaning meaning;
        struct sr_analog_spec spec;
        struct context *inc;
-       float fdata[CHUNK_SIZE];
+       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 * sizeof(float));
-       total_samples = num_samples * inc->num_channels;
+
        for (samplenum = 0; samplenum < total_samples; samplenum++) {
                if (inc->fmt_code == WAVE_FORMAT_PCM_) {
                        switch (inc->unitsize) {
@@ -238,29 +242,20 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
        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;
 
        inc = in->priv;
        if (!inc->started) {
                std_session_send_df_header(in->sdi);
-
-               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);
-
+               (void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE,
+                       g_variant_new_uint64(inc->samplerate));
                inc->started = TRUE;
        }
 
@@ -306,11 +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[8];
+       char channelname[16];
 
        g_string_append_len(in->buf, buf->str, buf->len);
 
@@ -334,6 +367,8 @@ static int receive(struct sr_input *in, GString *buf)
                        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;
@@ -364,9 +399,19 @@ static int end(struct sr_input *in)
 
 static int reset(struct sr_input *in)
 {
-       struct context *inc = in->priv;
+       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);
 
-       inc->started = FALSE;
        g_string_truncate(in->buf, 0);
 
        return SR_OK;
@@ -375,7 +420,7 @@ static int reset(struct sr_input *in)
 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,