X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=252f323b3e59246f170d67091de04bdd531aea25;hp=02f04b4809e66864e78e0bde29b8cd0665c6984e;hb=3010ef96e10cb15d423eef8f9802fbed78744393;hpb=271c83d4fd9411be628fa650ce595ac79754d22e

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 02f04b48..252f323b 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -8,12 +8,14 @@
 
 #include <regex.h>
 #include <vorbis/vorbisfile.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "oggdec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
@@ -35,9 +37,15 @@ struct private_oggdec_data {
 	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(void *buf, size_t size, size_t nmemb, void *datasource)
+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;
@@ -58,6 +66,40 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 	return ret;
 }
 
+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;
+	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);
+	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)
+{
+	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.
  *
@@ -95,6 +137,7 @@ static void ogg_open(struct filter_node *fn)
 	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)
@@ -113,6 +156,143 @@ static void ogg_close(struct filter_node *fn)
 	fn->private_data = NULL;
 }
 
+#define OGGDEC_OUTPUT_CHUNK_SIZE (64 * 1024)
+
+static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
+{
+	struct filter_node *fn = btr_context(btrn);
+	struct private_oggdec_data *pod = fn->private_data;
+
+	if (!strcmp(cmd, "samplerate")) {
+		if (pod->samplerate == 0)
+			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+		*result = make_message("%u", pod->samplerate);
+		return 1;
+	}
+	if (!strcmp(cmd, "channels")) {
+		if (pod->channels == 0)
+			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+		*result = make_message("%u", pod->channels);
+		return 1;
+	}
+	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);
+	struct private_oggdec_data *pod = fn->private_data;
+	struct btr_node *btrn = fn->btrn;
+	size_t iqs, len;
+	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 out;
+	btr_merge(btrn, fn->min_iqs);
+	len = btr_next_buffer(btrn, &in);
+	iqs = btr_get_input_queue_size(btrn);
+	if (!pod->vf) {
+		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) {
+			if (btr_no_parent(btrn))
+				ret = -E_OGGDEC_EOF;
+			else
+				ret = 0;
+			goto out;
+		}
+		ret = 0;
+		if (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)
+			return; /* enough data for the moment */
+	}
+out:
+	if (ret < 0) {
+		t->error = ret;
+		btr_remove_node(btrn);
+	}
+}
+
 static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 {
 	ssize_t ret;
@@ -124,41 +304,60 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 	pod->converted = 0;
 
 	if (!pod->vf) {
-		int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
 		if (*fn->fc->input_error < 0)
 			return *fn->fc->input_error;
-		if (len < ib) {
-			PARA_DEBUG_LOG("initial input buffer %zd/%d, "
-				"waiting for more data\n", len, ib);
+		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_ENOTVORBIS)
-			return -E_OGGDEC_NOTVORBIS;
 		if (ret == OV_EVERSION)
 			return -E_OGGDEC_VERSION;
-		if (ret == OV_EBADHEADER)
-			return -E_OGGDEC_BADHEADER;
 		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 == OV_HOLE || !read_ret)
+		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;
@@ -191,6 +390,11 @@ err:
 	return ret;
 }
 
+static void oggdec_free_config(void *conf)
+{
+	oggdec_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the ogg vorbis decoder.
  *
@@ -204,7 +408,11 @@ void oggdec_filter_init(struct filter *f)
 	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;
+	f->free_config = oggdec_free_config;
+	f->execute = oggdec_execute;
 	f->help = (struct ggo_help) {
 		.short_help = oggdec_filter_args_info_help,
 		.detailed_help = oggdec_filter_args_info_detailed_help