/*
- * 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. */
- unsigned int samplerate;
+ unsigned int sample_rate;
};
static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
struct filter_node *fn = btr_context(btrn);
struct private_oggdec_data *pod = fn->private_data;
- if (!strcmp(cmd, "samplerate")) {
- if (pod->samplerate == 0)
- return -E_BTR_NAVAIL;
- *result = make_message("%u", pod->samplerate);
- 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)
if (oret < 0)
goto out;
pod->channels = ov_info(pod->vf, 0)->channels;
- pod->samplerate = ov_info(pod->vf, 0)->rate;
+ pod->sample_rate = ov_info(pod->vf, 0)->rate;
PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
- pod->samplerate);
+ pod->sample_rate);
ret = 1;
out:
if (ret <= 0) {
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);
+ int ret;
+
+ t->error = 0;
+ ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
+ if (ret != 0)
+ sched_min_delay(s);
+ else
+ sched_request_timeout_ms(100, s);
+}
+
static void ogg_post_select(__a_unused struct sched *s, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
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 */
}
{
f->open = ogg_open;
f->close = ogg_close;
- f->pre_select = generic_filter_pre_select;
+ f->pre_select = ogg_pre_select;
f->post_select = ogg_post_select;
f->execute = oggdec_execute;
}