#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
int num_channels;
int unitsize;
gboolean found_data;
+ gboolean create_channels;
};
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;
if ((ret = parse_wav_header(buf, NULL)) != SR_OK)
return ret;
+ *confidence = 1;
+
return SR_OK;
}
static int init(struct sr_input *in, GHashTable *options)
{
+ struct context *inc;
+
(void)options;
in->sdi = g_malloc0(sizeof(struct sr_dev_inst));
in->priv = g_malloc0(sizeof(struct context));
+ inc = in->priv;
+
+ inc->create_channels = TRUE;
return SR_OK;
}
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;
+ 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_) {
switch (inc->unitsize) {
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;
}
{
struct context *inc;
int ret;
+ char channelname[16];
g_string_append_len(in->buf, buf->str, buf->len);
else if (ret != SR_OK)
return ret;
+ if (inc->create_channels) {
+ 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);
+ }
+ }
+
+ inc->create_channels = FALSE;
+
/* sdi is ready, notify frontend. */
in->sdi_ready = TRUE;
return SR_OK;
static int end(struct sr_input *in)
{
- struct sr_datafeed_packet packet;
struct context *inc;
int ret;
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)
+{
+ memset(in->priv, 0, sizeof(struct context));
+
+ /*
+ * We only want to create the sigrok channels once, so
+ * inc->create_channels won't be set to TRUE this time around.
+ */
+
+ 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,
};
projects / libsigrok.git / blobdiff