input/logicport: Fix outdated format_match().

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

diff --git a/src/input/wav.c b/src/input/wav.c
index f7574334da78e045c287a16f18e1f036da74a904..75f1ecce8c2116deee6a3296c58cf9c895cab57e 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
@@ -124,7 +124,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 +143,8 @@ static int format_match(GHashTable *metadata)
        if ((ret = parse_wav_header(buf, NULL)) != SR_OK)
                return ret;
 
+       *confidence = 1;
+
        return SR_OK;
 }
 
@@ -184,17 +186,20 @@ static int find_data_chunk(GString *buf, int initial_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];
+       float *fdata;
        int total_samples, samplenum;
        char *s, *d;
 
        inc = in->priv;
 
        s = in->buf->str + offset;
+       fdata = g_malloc0(CHUNK_SIZE * sizeof(float));
        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_) {
@@ -223,15 +228,19 @@ 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)
@@ -245,7 +254,7 @@ static int process_buffer(struct sr_input *in)
 
        inc = in->priv;
        if (!inc->started) {
-               std_session_send_df_header(in->sdi, LOG_PREFIX);
+               std_session_send_df_header(in->sdi);
 
                packet.type = SR_DF_META;
                packet.payload = &meta;
@@ -325,7 +334,7 @@ static int receive(struct sr_input *in, GString *buf)
                        return ret;
 
                for (int i = 0; i < inc->num_channels; i++) {
-                       snprintf(channelname, 8, "CH%d", i + 1);
+                       snprintf(channelname, sizeof(channelname), "CH%d", i + 1);
                        sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname);
                }
 
@@ -341,7 +350,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 +359,31 @@ 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 = in->priv;
+
+       inc->started = FALSE;
+       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,
 };