/*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** The number of channels of the current stream. */
unsigned int channels;
/** Current sample rate in Hz. */
- struct timeval stream_start;
unsigned int sample_rate;
};
struct filter_node *fn = btr_context(btrn);
struct private_oggdec_data *pod = fn->private_data;
- if (!strcmp(cmd, "sample_rate")) {
- if (pod->sample_rate == 0)
- return -E_BTR_NAVAIL;
- *result = make_message("%u", pod->sample_rate);
- return 1;
- }
- if (!strcmp(cmd, "channels")) {
- if (pod->channels == 0)
- return -E_BTR_NAVAIL;
- *result = make_message("%u", pod->channels);
- return 1;
- }
- return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+ return decoder_execute(cmd, pod->sample_rate, pod->channels, result);
}
static int ogg_init(struct filter_node *fn)
struct btr_node *btrn = fn->btrn;
int ret, oret;
size_t iqs;
+ struct OggVorbis_File *vf = para_malloc(sizeof(*vf));
- 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,
+ oret = ov_open_callbacks(fn, vf,
NULL, /* no initial buffer */
0, /* no initial bytes */
ovc); /* the ov_open_callbacks */
ret = -E_OGGDEC_FAULT;
if (oret < 0)
goto out;
- pod->channels = ov_info(pod->vf, 0)->channels;
- pod->sample_rate = ov_info(pod->vf, 0)->rate;
- tv_add(now, &(struct timeval)EMBRACE(0, 300 * 1000), &pod->stream_start);
+ pod->channels = ov_info(vf, 0)->channels;
+ pod->sample_rate = ov_info(vf, 0)->rate;
PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
pod->sample_rate);
ret = 1;
out:
- if (ret <= 0) {
- free(pod->vf);
- pod->vf = NULL;
- } else {
+ if (ret <= 0)
+ free(vf);
+ else {
btr_consume(btrn, pod->converted);
pod->converted = 0;
fn->min_iqs = 0;
+ pod->vf = vf;
}
return ret;
}
static void ogg_pre_select(__a_unused struct sched *s, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
- struct private_oggdec_data *pod = fn->private_data;
int ret;
t->error = 0;
ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
- if (ret < 0)
+ if (ret != 0)
sched_min_delay(s);
else
- sched_request_barrier(&pod->stream_start, s);
+ sched_request_timeout_ms(100, s);
}
static void ogg_post_select(__a_unused struct sched *s, struct task *t)
struct btr_node *btrn = fn->btrn;
int ret, ns;
- if (tv_diff(&pod->stream_start, now, NULL) > 0)
- return;
pod->converted = 0;
t->error = 0;
ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+ if (ret <= 0)
+ goto out;
if (!pod->vf) {
if (ret <= 0)
goto out;
if (read_ret <= 0)
free(out);
ret = ns;
+ if (read_ret == OV_HOLE) /* avoid buffer underruns */
+ fn->min_iqs = 9000;
if (read_ret == 0 || read_ret == OV_HOLE)
goto out;
ret = -E_OGGDEC_BADLINK;
if (read_ret < 0)
goto out;
btr_add_output(out, read_ret, btrn);
+ fn->min_iqs = 0;
if (btr_get_output_queue_size(btrn) > 128 * 1024)
return; /* enough data for the moment */
}