X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=4ff2aad20198edada3d56c039606834392c13d38;hp=bac28cfdee77d5a9d48d343fc7f208111f437991;hb=0113172c1f18f4a168b0a0fdacb376da2f2a73e3;hpb=d9d83772fbee853857f1904fa6553f06a026108c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index bac28cfd..4ff2aad2 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -33,8 +33,6 @@ struct private_oggdec_data {
 	OggVorbis_File *vf;
 	/** 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. */
@@ -125,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;
 	}
@@ -144,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",
@@ -184,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) {
@@ -243,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: