X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=bac28cfdee77d5a9d48d343fc7f208111f437991;hp=511e6405e533c1028a511b0828ea479b31b67b77;hb=11ef83c4abb2ccbdf3f99a8adf98749b2b0656c2;hpb=c282c836791cedf57c128555af90af37c7c01c05

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 511e6405..bac28cfd 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -31,10 +31,6 @@
 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. */
@@ -45,63 +41,28 @@ struct private_oggdec_data {
 	unsigned int samplerate;
 };
 
-static size_t cb_read_nobtr(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;
-	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)
-{
-	struct filter_node *fn = datasource;
 	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;
-}
-
-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);
+	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;
 }
 
 /*
@@ -136,11 +97,9 @@ static void ogg_open(struct filter_node *fn)
 {
 	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;
 }
 
 static void ogg_close(struct filter_node *fn)
@@ -152,9 +111,7 @@ static void ogg_close(struct filter_node *fn)
 		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;
 }
@@ -190,7 +147,8 @@ static int ogg_init(struct filter_node *fn)
 	struct timeval delay = {0, 500 * 1000};
 
 	pod->vf = para_malloc(sizeof(struct OggVorbis_File));
-	PARA_NOTICE_LOG("min_iqs: %zu, opening ov callbacks\n", fn->min_iqs);
+	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 */
@@ -202,9 +160,11 @@ open:
 			fn->min_iqs += 1000;
 			iqs = btr_get_input_queue_size(btrn);
 			ret = 0;
-			if (iqs <= fn->min_iqs)
+			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)?
@@ -231,8 +191,11 @@ out:
 	if (ret <= 0) {
 		free(pod->vf);
 		pod->vf = NULL;
-	} else
+	} else {
+		btr_consume(btrn, pod->converted);
+		pod->converted = 0;
 		fn->min_iqs = 0;
+	}
 	return ret;
 }
 
@@ -245,6 +208,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	int ret;
 	char *in;
 
+	pod->converted = 0;
 	t->error = 0;
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret <= 0)
@@ -261,6 +225,8 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 		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) {
@@ -287,78 +253,6 @@ 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;
@@ -401,7 +295,6 @@ void oggdec_filter_init(struct filter *f)
 	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;