static size_t cb_read_btr(void *buf, size_t size, size_t nmemb, void *datasource)
{
struct filter_node *fn = datasource;
+ struct private_oggdec_data *pod = fn->private_data;
struct btr_node *btrn = fn->btrn;
- size_t copied;
+ char *btr_buf;
+ size_t nbytes = btr_next_buffer(btrn, &btr_buf), tmp;
/**
* oggvorbis always uses size == 1. Other sizes would complicate the code
* for no real gain. So we simply don't support size != 1.
*/
assert(size == 1);
- //PARA_DEBUG_LOG("vorbis requests %zu x %zu = %zu bytes\n", size, nmemb, size * nmemb);
- copied = 0;
- for (;;) {
- char *btr_buf;
- size_t nbytes = btr_next_buffer(btrn, &btr_buf);
- if (nbytes == 0)
- break;
- nbytes = PARA_MIN(nmemb - copied, nbytes);
- memcpy(buf + copied, btr_buf, nbytes);
- copied += nbytes;
- btr_consume(btrn, nbytes);
- if (copied == nmemb)
- break;
- }
- return copied;
+ assert(pod->converted <= nbytes);
+ tmp = nbytes - pod->converted;
+ PARA_DEBUG_LOG("vorbis requests %zu bytes have %zu\n", nmemb, tmp);
+ tmp = PARA_MIN(tmp, nmemb);
+ if (tmp == 0)
+ return 0;
+ memcpy(buf, btr_buf + pod->converted, tmp);
+ pod->converted += tmp;
+ return tmp;
}
static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
fn->private_data = pod;
fn->bufsize = conf->bufsize_arg * 1024;
fn->buf = para_malloc(fn->bufsize);
+ fn->min_iqs = 8000;
}
static void ogg_close(struct filter_node *fn)
return -ERRNO_TO_PARA_ERROR(ENOTSUP);
}
+static int ogg_init(struct filter_node *fn)
+{
+ struct private_oggdec_data *pod = fn->private_data;
+ struct btr_node *btrn = fn->btrn;
+ int ret, oret;
+ size_t iqs;
+ struct timeval delay = {0, 500 * 1000};
+
+ pod->vf = para_malloc(sizeof(struct OggVorbis_File));
+ PARA_NOTICE_LOG("iqs: %zu, min_iqs: %zu, opening ov callbacks\n",
+ btr_get_input_queue_size(btrn), fn->min_iqs);
+open:
+ oret = ov_open_callbacks(fn, pod->vf,
+ NULL, /* no initial buffer */
+ 0, /* no initial bytes */
+ ovc); /* the ov_open_callbacks */
+ if (oret == OV_ENOTVORBIS || oret == OV_EBADHEADER) {
+ /* this might be due to the input buffer being too small */
+ if (!btr_no_parent(btrn)) {
+ fn->min_iqs += 1000;
+ iqs = btr_get_input_queue_size(btrn);
+ ret = 0;
+ if (iqs < fn->min_iqs)
+ goto out;
+ PARA_CRIT_LOG("iqs: %zu\n", iqs);
+ btr_merge(btrn, fn->min_iqs);
+ pod->converted = 0;
+ goto open;
+ }
+ ret = (oret == OV_ENOTVORBIS)?
+ -E_OGGDEC_NOTVORBIS : -E_OGGDEC_BADHEADER;
+ goto out;
+ }
+ ret = -E_OGGDEC_READ;
+ if (oret == OV_EREAD)
+ goto out;
+ ret = -E_OGGDEC_VERSION;
+ if (oret == OV_EVERSION)
+ goto out;
+ ret = -E_OGGDEC_FAULT;
+ if (oret < 0)
+ goto out;
+ pod->channels = ov_info(pod->vf, 0)->channels;
+ pod->samplerate = ov_info(pod->vf, 0)->rate;
+ PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
+ pod->samplerate);
+ /* wait a bit to avoid buffer underruns */
+ tv_add(now, &delay, &pod->stream_start);
+ ret = 1;
+out:
+ if (ret <= 0) {
+ free(pod->vf);
+ pod->vf = NULL;
+ } else {
+ btr_consume(btrn, pod->converted);
+ pod->converted = 0;
+ fn->min_iqs = 0;
+ }
+ return ret;
+}
+
static void ogg_post_select(__a_unused struct sched *s, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
int ret;
char *in;
+ pod->converted = 0;
t->error = 0;
ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
- if (ret < 0)
- goto err;
- if (ret == 0)
- return;
+ if (ret <= 0)
+ goto out;
btr_merge(btrn, fn->min_iqs);
len = btr_next_buffer(btrn, &in);
iqs = btr_get_input_queue_size(btrn);
if (!pod->vf) {
- int oret;
-
- pod->vf = para_malloc(sizeof(struct OggVorbis_File));
- PARA_NOTICE_LOG("input queue: %zu, opening ov callbacks\n", iqs);
- oret = ov_open_callbacks(fn, pod->vf,
- NULL, /* no initial buffer */
- 0, /* no initial bytes */
- ovc); /* the ov_open_callbacks */
- if (oret == OV_ENOTVORBIS || oret == OV_EBADHEADER) {
- /* this might be due to the input buffer being too small */
- if (!btr_no_parent(btrn)) {
- free(pod->vf);
- pod->vf = NULL;
- fn->min_iqs = iqs + 1;
- return;
- }
- ret = (oret == OV_ENOTVORBIS)?
- -E_OGGDEC_NOTVORBIS : -E_OGGDEC_BADHEADER;
- goto err;
- }
- ret = -E_OGGDEC_READ;
- if (oret == OV_EREAD)
- goto err;
- ret = -E_OGGDEC_VERSION;
- if (oret == OV_EVERSION)
- goto err;
- ret = -E_OGGDEC_FAULT;
- if (oret < 0)
- goto err;
- pod->channels = ov_info(pod->vf, 0)->channels;
- pod->samplerate = ov_info(pod->vf, 0)->rate;
- PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
- pod->samplerate);
- ///* wait a bit to avoid buffer underruns */
- //tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start);
- return;
+ ret = ogg_init(fn);
+ if (ret <= 0)
+ goto out;
}
for (;;) {
char *out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
ssize_t read_ret = ov_read(pod->vf, out, OGGDEC_OUTPUT_CHUNK_SIZE,
ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);
+ btr_consume(btrn, pod->converted);
+ pod->converted = 0;
if (read_ret <= 0)
free(out);
if (read_ret == 0) {
- ret = -E_OGGDEC_EOF;
if (btr_no_parent(btrn))
- goto err;
- return;
+ ret = -E_OGGDEC_EOF;
+ else
+ ret = 0;
+ goto out;
}
+ ret = 0;
if (read_ret == OV_HOLE)
- return;
- if (read_ret < 0) {
- ret = -E_OGGDEC_BADLINK;
- goto err;
- }
+ goto out;
+ ret = -E_OGGDEC_BADLINK;
+ if (read_ret < 0)
+ goto out;
btr_add_output(out, read_ret, btrn);
+ if (btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL) == 0)
+ return; /* enough data for the moment */
+ }
+out:
+ if (ret < 0) {
+ t->error = ret;
+ btr_remove_node(btrn);
}
-
-err:
- assert(ret < 0);
- t->error = ret;
- btr_remove_node(btrn);
}
static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
return ret;
}
+static void oggdec_free_config(void *conf)
+{
+ oggdec_cmdline_parser_free(conf);
+}
+
/**
* The init function of the ogg vorbis decoder.
*
f->pre_select = generic_filter_pre_select;
f->post_select = ogg_post_select;
f->parse_config = oggdec_parse_config;
+ f->free_config = oggdec_free_config;
f->execute = oggdec_execute;
f->help = (struct ggo_help) {
.short_help = oggdec_filter_args_info_help,
projects / paraslash.git / blobdiff