X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=4ff2aad20198edada3d56c039606834392c13d38;hp=18ca437d8494b6c0fb48bba10555d7f989819adb;hb=9148b53eb42dc52ed52cbc3540a26815f333238b;hpb=bcde4ae4b702fdf496a3be1cf7fefbeef7f77456

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 18ca437d..4ff2aad2 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -31,42 +31,15 @@
 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;
@@ -90,16 +63,6 @@ static size_t cb_read_btr(void *buf, size_t size, size_t nmemb, void *datasource
 	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.
  *
@@ -132,11 +95,8 @@ 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;
 }
 
@@ -149,9 +109,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;
 }
@@ -165,13 +123,13 @@ static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 
 	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;
 	}
@@ -184,7 +142,6 @@ static int ogg_init(struct filter_node *fn)
 	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",
@@ -224,8 +181,6 @@ open:
 	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) {
@@ -283,7 +238,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 		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: