/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
struct private_oggdec_data {
/** Describes an ogg vorbis file. */
OggVorbis_File *vf;
- /** The input buffer. */
- char *inbuf;
- /** The length of \a inbuf. */
- size_t inbuf_len;
/** The number of bytes consumed from the input buffer. */
size_t converted;
- /** When to start producing output. */
- struct timeval stream_start;
/** The number of channels of the current stream. */
unsigned int channels;
/** Current sample rate in Hz. */
unsigned int samplerate;
};
-static size_t cb_read_nobtr(void *buf, size_t size, size_t nmemb, void *datasource)
-{
- struct filter_node *fn = datasource;
- struct private_oggdec_data *pod = fn->private_data;
- size_t ret, have = pod->inbuf_len - pod->converted;
- char *p = pod->inbuf + pod->converted;
-
-// PARA_DEBUG_LOG("pod = %p\n", pod);
-// PARA_DEBUG_LOG("vorbis requests %d bytes, have %d\n", size * nmemb, have);
- if (pod->inbuf_len < size) {
- if (*fn->fc->input_error)
- return 0;
- errno = EAGAIN;
- return (size_t)-1;
- }
- ret = PARA_MIN(nmemb, have / size) * size;
- memcpy(buf, p, ret);
- pod->converted += ret;
- return ret;
-}
-
-static size_t cb_read_btr(void *buf, size_t size, size_t nmemb, void *datasource)
+static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
{
struct filter_node *fn = datasource;
struct private_oggdec_data *pod = fn->private_data;
return tmp;
}
-static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
-{
- struct filter_node *fn = datasource;
-
- if (fn->btrn)
- return cb_read_btr(buf, size, nmemb, datasource);
- else
- return cb_read_nobtr(buf, size, nmemb, datasource);
-}
-
/*
* Custom data seeking function.
*
{
struct private_oggdec_data *pod = para_calloc(
sizeof(struct private_oggdec_data));
- struct oggdec_filter_args_info *conf = fn->conf;
fn->private_data = pod;
- fn->bufsize = conf->bufsize_arg * 1024;
- fn->buf = para_malloc(fn->bufsize);
fn->min_iqs = 8000;
}
free(pod->vf);
pod->vf = NULL;
} else
- PARA_DEBUG_LOG("nothing to close in fc %p, pod = %p\n", pod->vf, pod);
- free(fn->buf);
- fn->buf = NULL;
+ PARA_DEBUG_LOG("nothing to close\n");
free(fn->private_data);
fn->private_data = NULL;
}
if (!strcmp(cmd, "samplerate")) {
if (pod->samplerate == 0)
- return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+ return -E_BTR_NAVAIL;
*result = make_message("%u", pod->samplerate);
return 1;
}
if (!strcmp(cmd, "channels")) {
if (pod->channels == 0)
- return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+ return -E_BTR_NAVAIL;
*result = make_message("%u", pod->channels);
return 1;
}
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",
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) {
struct filter_node *fn = container_of(t, struct filter_node, task);
struct private_oggdec_data *pod = fn->private_data;
struct btr_node *btrn = fn->btrn;
- size_t iqs, len;
- int ret;
- char *in;
+ int ret, ns;
pod->converted = 0;
t->error = 0;
- ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
- if (ret <= 0)
- goto out;
- btr_merge(btrn, fn->min_iqs);
- len = btr_next_buffer(btrn, &in);
- iqs = btr_get_input_queue_size(btrn);
+ ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
if (!pod->vf) {
+ if (ret <= 0)
+ goto out;
+ btr_merge(btrn, fn->min_iqs);
ret = ogg_init(fn);
if (ret <= 0)
goto out;
pod->converted = 0;
if (read_ret <= 0)
free(out);
- if (read_ret == 0) {
- if (btr_no_parent(btrn))
- ret = -E_OGGDEC_EOF;
- else
- ret = 0;
- goto out;
- }
- ret = 0;
- if (read_ret == OV_HOLE)
+ ret = ns;
+ 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);
- if (btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL) == 0)
+ if (btr_get_output_queue_size(btrn) > 640 * 1024)
return; /* enough data for the moment */
}
out:
}
}
-static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
-{
- ssize_t ret;
- struct private_oggdec_data *pod = fn->private_data;
- struct oggdec_filter_args_info *conf = fn->conf;
- /* make the buffer known to the read callback cb_read() */
- pod->inbuf = inbuffer;
- pod->inbuf_len = len;
- pod->converted = 0;
-
- if (!pod->vf) {
- if (*fn->fc->input_error < 0)
- return *fn->fc->input_error;
- if (!len)
- return 0;
- pod->vf = para_malloc(sizeof(struct OggVorbis_File));
- PARA_NOTICE_LOG("input buffer: %zd, opening ov callbacks\n", len);
- ret = ov_open_callbacks(fn, pod->vf,
- NULL, /* no initial buffer */
- 0, /* no initial bytes */
- ovc); /* the ov_open_callbacks */
- if (ret == OV_ENOTVORBIS || ret == OV_EBADHEADER) {
- /* this might be due to the input buffer being too small */
- int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
- if (len < ib) {
- PARA_INFO_LOG("initial input buffer %zd/%d, "
- "waiting for more data\n", len, ib);
- free(pod->vf);
- pod->vf = NULL;
- return 0;
- }
- return ret == OV_ENOTVORBIS?
- -E_OGGDEC_NOTVORBIS : -E_OGGDEC_BADHEADER;
- }
- if (ret == OV_EREAD)
- return -E_OGGDEC_READ;
- if (ret == OV_EVERSION)
- return -E_OGGDEC_VERSION;
- if (ret < 0)
- return -E_OGGDEC_FAULT;
- fn->fc->channels = ov_info(pod->vf, 0)->channels;
- fn->fc->samplerate = ov_info(pod->vf, 0)->rate;
- PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels,
- fn->fc->samplerate);
- /* wait a bit to avoid buffer underruns */
- tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start);
- return pod->converted;
- }
- if (tv_diff(now, &pod->stream_start, NULL) < 0) {
- PARA_DEBUG_LOG("initial delay..\n");
- return 0;
- }
- while (fn->loaded < fn->bufsize) {
- int length = fn->bufsize - fn->loaded;
- long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length,
- ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);
- if (read_ret == 0)
- return pod->converted;
- if (read_ret == OV_HOLE) {
- if (!fn->loaded) {
- PARA_INFO_LOG("hole, delaying playback\n");
- tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start);
- }
- return pod->converted;
- }
- if (read_ret < 0)
- return -E_OGGDEC_BADLINK;
- fn->loaded += read_ret;
- }
- return pod->converted;
-}
-
static int oggdec_parse_config(int argc, char **argv, void **config)
{
int ret;
oggdec_cmdline_parser_init(&dummy);
f->open = ogg_open;
f->close = ogg_close;
- f->convert = ogg_convert;
f->pre_select = generic_filter_pre_select;
f->post_select = ogg_post_select;
f->parse_config = oggdec_parse_config;
projects / paraslash.git / blobdiff