#include <fcntl.h>
#include <ctype.h>
#include <string.h>
+#include <stdint.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
/* Expect to find the "data" chunk within this offset from the start. */
#define MAX_DATA_CHUNK_OFFSET 256
-#define WAVE_FORMAT_PCM 1
-#define WAVE_FORMAT_IEEE_FLOAT 3
+#define WAVE_FORMAT_PCM 0x0001
+#define WAVE_FORMAT_IEEE_FLOAT 0x0003
+#define WAVE_FORMAT_EXTENSIBLE 0xfffe
struct context {
int fmt_code;
static int parse_wav_header(GString *buf, struct context *inc)
{
uint64_t samplerate;
- int fmt_code, samplesize, num_channels, unitsize;
+ unsigned int fmt_code, samplesize, num_channels, unitsize;
- if (buf->len < MIN_DATA_CHUNK_OFFSET) {
- return SR_ERR;
+ if (buf->len < MIN_DATA_CHUNK_OFFSET)
+ return SR_OK_CONTINUE;
+
+ fmt_code = RL16(buf->str + 20);
+ samplerate = RL32(buf->str + 24);
+
+ samplesize = RL16(buf->str + 32);
+ if (samplesize != 8 && samplesize != 16 && samplesize != 32) {
+ sr_err("Only 8, 16 or 32 bits per sample supported.");
+ return SR_ERR_DATA;
}
- fmt_code = GUINT16_FROM_LE(*(uint16_t *)(buf->str + 20));
- samplerate = GUINT32_FROM_LE(*(uint32_t *)(buf->str + 24));
- samplesize = GUINT16_FROM_LE(*(uint16_t *)(buf->str + 32));
- num_channels = GUINT16_FROM_LE(*(uint16_t *)(buf->str + 22));
- /* TODO div0 */
+ num_channels = RL16(buf->str + 22);
+ if (num_channels == 0)
+ return SR_ERR;
unitsize = samplesize / num_channels;
if (fmt_code == WAVE_FORMAT_PCM) {
- if (samplesize != 1 && samplesize != 2 && samplesize != 4) {
- sr_err("only 8, 16 or 32 bits per sample supported.");
- return SR_ERR;
- }
} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT) {
if (unitsize != 4) {
sr_err("only 32-bit floats supported.");
+ return SR_ERR_DATA;
+ }
+ } else if (fmt_code == WAVE_FORMAT_EXTENSIBLE) {
+ if (buf->len < 70)
+ /* Not enough for extensible header and next chunk. */
+ return SR_OK_CONTINUE;
+
+ if (RL16(buf->str + 16) != 40) {
+ sr_err("WAV extensible format chunk must be 40 bytes.");
return SR_ERR;
}
+ if (RL16(buf->str + 36) != 22) {
+ sr_err("WAV extension must be 22 bytes.");
+ return SR_ERR;
+ }
+ if (RL16(buf->str + 34) != RL16(buf->str + 38)) {
+ sr_err("Reduced valid bits per sample not supported.");
+ return SR_ERR_DATA;
+ }
+ /* Real format code is the first two bytes of the GUID. */
+ fmt_code = RL16(buf->str + 44);
+ if (fmt_code != WAVE_FORMAT_PCM && fmt_code != WAVE_FORMAT_IEEE_FLOAT) {
+ 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;
+ return SR_ERR_DATA;
}
if (inc) {
static int format_match(GHashTable *metadata)
{
GString *buf;
+ int ret;
buf = g_hash_table_lookup(metadata, GINT_TO_POINTER(SR_INPUT_META_HEADER));
if (strncmp(buf->str, "RIFF", 4))
- return FALSE;
+ return SR_ERR;
if (strncmp(buf->str + 8, "WAVE", 4))
- return FALSE;
+ return SR_ERR;
if (strncmp(buf->str + 12, "fmt ", 4))
- return FALSE;
+ return SR_ERR;
/*
* Only gets called when we already know this is a WAV file, so
* this parser can log error messages.
*/
- if (parse_wav_header(buf, NULL) != SR_OK)
- return FALSE;
+ if ((ret = parse_wav_header(buf, NULL)) != SR_OK)
+ return ret;
- return TRUE;
+ return SR_OK;
}
static int init(struct sr_input *in, GHashTable *options)
return -1;
}
/* Skip past this chunk. */
- offset += 8 + GUINT32_FROM_LE(*(uint32_t *)(buf->str + offset + 4));
+ offset += 8 + RL32(buf->str + offset + 4);
}
return offset;
struct sr_channel *ch;
struct sr_config *src;
struct context *inc;
- int i;
+ int ret, i;
char channelname[8];
if (!in->buf)
return SR_ERR;
inc = in->priv = g_malloc(sizeof(struct context));
- if (parse_wav_header(in->buf, inc) != SR_OK)
- return SR_ERR;
+ 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);
switch (inc->samplesize) {
case 1:
/* 8-bit PCM samples are unsigned. */
- fdata[samplenum] = (uint8_t)sample / 255.0;
+ fdata[samplenum] = (uint8_t)sample / (float)255;
break;
case 2:
- fdata[samplenum] = GINT16_FROM_LE(sample) / 32767.0;
+ fdata[samplenum] = RL16S(&sample) / (float)INT16_MAX;
break;
case 4:
- fdata[samplenum] = GINT32_FROM_LE(sample) / 65535.0;
+ fdata[samplenum] = RL32S(&sample) / (float)INT32_MAX;
break;
}
} 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
static int receive(const struct sr_input *in, GString *buf)
{
- struct sr_datafeed_packet packet;
struct context *inc;
int offset, chunk_samples, total_samples, processed, max_chunk_samples, num_samples, i;
- if (buf->len == 0) {
- /* End of stream. */
- packet.type = SR_DF_END;
- sr_session_send(in->sdi, &packet);
- return SR_OK;
- }
-
g_string_append_len(in->buf, buf->str, buf->len);
if (!in->priv) {
if (!inc->found_data) {
/* Skip past size of 'fmt ' chunk. */
- i = 20 + GUINT32_FROM_LE(*(uint32_t *)(in->buf->str + 16));
+ i = 20 + RL32(in->buf->str + 16);
offset = find_data_chunk(in->buf, i);
if (offset < 0) {
if (in->buf->len > MAX_DATA_CHUNK_OFFSET) {
static int cleanup(struct sr_input *in)
{
- g_free(in->priv);
- in->priv = NULL;
+ struct sr_datafeed_packet packet;
+
+ if (in->priv) {
+ /* End of stream. */
+ packet.type = SR_DF_END;
+ sr_session_send(in->sdi, &packet);
+
+ g_free(in->priv);
+ in->priv = NULL;
+ }
return SR_OK;
}
projects / libsigrok.git / blobdiff