* the input modules to find a match. This is format-dependent, but
* 128 bytes is normally enough.
*
- * If an input module is found, an instance is created and returned.
- * Otherwise, NULL is returned.
+ * If an input module is found, an instance is created into *in.
+ * Otherwise, *in contains NULL.
*
* If an instance is created, it has the given buffer used for scanning
* already submitted to it, to be processed before more data is sent.
* it again later.
*
*/
-SR_API const struct sr_input *sr_input_scan_buffer(GString *buf)
+SR_API int sr_input_scan_buffer(GString *buf, const struct sr_input **in)
{
- struct sr_input *in;
const struct sr_input_module *imod;
GHashTable *meta;
unsigned int m, i;
+ int ret;
uint8_t mitem, avail_metadata[8];
/* No more metadata to be had from a buffer. */
avail_metadata[0] = SR_INPUT_META_HEADER;
avail_metadata[1] = 0;
- in = NULL;
+ *in = NULL;
+ ret = SR_ERR;
for (i = 0; input_module_list[i]; i++) {
imod = input_module_list[i];
if (!imod->metadata[0]) {
g_hash_table_destroy(meta);
continue;
}
- if (!imod->format_match(meta)) {
+ sr_spew("Trying module %s.", imod->id);
+ ret = imod->format_match(meta);
+ g_hash_table_destroy(meta);
+ if (ret == SR_ERR_DATA) {
+ /* Module recognized this buffer, but cannot handle it. */
+ break;
+ } else if (ret == SR_ERR) {
/* Module didn't recognize this buffer. */
- g_hash_table_destroy(meta);
continue;
+ } else if (ret != SR_OK) {
+ /* Can be SR_OK_CONTINUE. */
+ return ret;
}
- g_hash_table_destroy(meta);
/* Found a matching module. */
- in = sr_input_new(imod, NULL);
- g_string_insert_len(in->buf, 0, buf->str, buf->len);
+ sr_spew("Module %s matched.", imod->id);
+ *in = sr_input_new(imod, NULL);
+ g_string_insert_len((*in)->buf, 0, buf->str, buf->len);
break;
}
- return in;
+ return ret;
}
/**
* Try to find an input module that can parse the given file.
*
- * If an input module is found, an instance is created and returned.
- * Otherwise, NULL is returned.
+ * If an input module is found, an instance is created into *in.
+ * Otherwise, *in contains NULL.
*
*/
-SR_API const struct sr_input *sr_input_scan_file(const char *filename)
+SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
{
- struct sr_input *in;
const struct sr_input_module *imod;
GHashTable *meta;
GString *header_buf;
struct stat st;
unsigned int midx, m, i;
- int fd;
+ int fd, ret;
ssize_t size;
uint8_t mitem, avail_metadata[8];
if (!filename || !filename[0]) {
sr_err("Invalid filename.");
- return NULL;
+ return SR_ERR_ARG;
}
if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
sr_err("No such file.");
- return NULL;
+ return SR_ERR_ARG;
}
if (stat(filename, &st) < 0) {
sr_err("%s", strerror(errno));
- return NULL;
+ return SR_ERR_ARG;
}
midx = 0;
avail_metadata[midx++] = SR_INPUT_META_HEADER;
/* TODO: MIME type */
- in = NULL;
+ *in = NULL;
+ ret = SR_ERR;
header_buf = g_string_sized_new(128);
for (i = 0; input_module_list[i]; i++) {
g_string_truncate(header_buf, 0);
if (!mitem)
/* Metadata list is 0-terminated. */
break;
- if (mitem == SR_INPUT_META_FILENAME)
+ if (mitem == SR_INPUT_META_FILENAME) {
g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
(gpointer)filename);
- else if (mitem == SR_INPUT_META_FILESIZE) {
- sr_dbg("inserting fs %d", st.st_size);
+ } else if (mitem == SR_INPUT_META_FILESIZE) {
g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
GINT_TO_POINTER(st.st_size));
} else if (mitem == SR_INPUT_META_HEADER) {
if ((fd = open(filename, O_RDONLY)) < 0) {
sr_err("%s", strerror(errno));
- return NULL;
+ return SR_ERR;
}
size = read(fd, header_buf->str, 128);
header_buf->len = size;
if (size <= 0) {
g_string_free(header_buf, TRUE);
sr_err("%s", strerror(errno));
- return NULL;
+ return SR_ERR;
}
g_hash_table_insert(meta, GINT_TO_POINTER(mitem), header_buf);
}
g_hash_table_destroy(meta);
continue;
}
- if (!imod->format_match(meta))
+ sr_spew("Trying module %s.", imod->id);
+ ret = imod->format_match(meta);
+ g_hash_table_destroy(meta);
+ if (ret == SR_ERR_DATA) {
+ /* Module recognized this buffer, but cannot handle it. */
+ break;
+ } else if (ret == SR_ERR) {
/* Module didn't recognize this buffer. */
continue;
+ } else if (ret != SR_OK) {
+ /* Can be SR_OK_CONTINUE. */
+ return ret;
+ }
/* Found a matching module. */
- in = sr_input_new(imod, NULL);
+ sr_spew("Module %s matched.", imod->id);
+ *in = sr_input_new(imod, NULL);
break;
}
g_string_free(header_buf, TRUE);
- return in;
+ return ret;
}
/**
unsigned int fmt_code, samplesize, num_channels, unitsize;
if (buf->len < MIN_DATA_CHUNK_OFFSET)
- return SR_ERR;
+ return SR_OK_CONTINUE;
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;
+ return SR_ERR_DATA;
}
num_channels = RL16(buf->str + 22);
} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT) {
if (unitsize != 4) {
sr_err("only 32-bit floats supported.");
- return SR_ERR;
+ return SR_ERR_DATA;
}
} else if (fmt_code == WAVE_FORMAT_EXTENSIBLE) {
if (buf->len < 70)
}
if (RL16(buf->str + 34) != RL16(buf->str + 38)) {
sr_err("Reduced valid bits per sample not supported.");
- return SR_ERR;
+ 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;
+ 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)
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);
projects / libsigrok.git / commitdiff