#define WAVE_FORMAT_EXTENSIBLE 0xfffe
struct context {
+ gboolean started;
int fmt_code;
uint64_t samplerate;
int samplesize;
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);
samplesize = RL16(buf->str + 32);
- if (samplesize != 1 && samplesize != 2 && samplesize != 4) {
- sr_err("Only 8, 16 or 32 bits per sample supported.");
- return SR_ERR_DATA;
- }
-
num_channels = RL16(buf->str + 22);
if (num_channels == 0)
return SR_ERR;
unitsize = samplesize / num_channels;
+ if (unitsize != 1 && unitsize != 2 && unitsize != 4) {
+ sr_err("Only 8, 16 or 32 bits per sample supported.");
+ return SR_ERR_DATA;
+ }
+
if (fmt_code == WAVE_FORMAT_PCM) {
} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT) {
} 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.");
sr_err("Only PCM and floating point samples are supported.");
return SR_ERR_DATA;
}
+ if (fmt_code == WAVE_FORMAT_IEEE_FLOAT && unitsize != 4) {
+ sr_err("only 32-bit floats supported.");
+ return SR_ERR_DATA;
+ }
} else {
sr_err("Only PCM and floating point samples are supported.");
return SR_ERR_DATA;
{
(void)options;
- in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
+ in->sdi = sr_dev_inst_new();
+ in->priv = g_malloc0(sizeof(struct context));
return SR_OK;
}
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;
} else {
/* BINARY32 float */
#ifdef WORDS_BIGENDIAN
+ int i;
for (i = 0; i < inc->unitsize; i++)
- d[i] = s[inc->unitsize - i];
+ d[i] = s[inc->unitsize - 1 - i];
#else
memcpy(d, s, inc->unitsize);
#endif
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_channel *ch;
+ 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);
+ 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);
+
+ inc->started = TRUE;
}
- inc = in->priv;
if (!inc->found_data) {
/* Skip past size of 'fmt ' chunk. */
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 = {
.format_match = format_match,
.init = init,
.receive = receive,
- .cleanup = cleanup,
+ .end = end,
};
projects / libsigrok.git / blobdiff