X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=8a40ce0c56192041bac5edcc9e00a76dd82dcaa8;hp=b07d39130bb2dcc8026ffe93cd9e0d5e2ccbf2d0;hb=d4d37bb32a8d6219f9f52aa2ee3de55eb7e099c8;hpb=082265c336da9b3fb576224beef4e96c72ca3f9c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index b07d3913..8a40ce0c 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -35,7 +35,8 @@ struct private_oggdec_data {
 	/** The number of channels of the current stream. */
 	unsigned int channels;
 	/** Current sample rate in Hz. */
-	unsigned int samplerate;
+	struct timeval stream_start;
+	unsigned int sample_rate;
 };
 
 static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
@@ -120,10 +121,10 @@ 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)
+	if (!strcmp(cmd, "sample_rate")) {
+		if (pod->sample_rate == 0)
 			return -E_BTR_NAVAIL;
-		*result = make_message("%u", pod->samplerate);
+		*result = make_message("%u", pod->sample_rate);
 		return 1;
 	}
 	if (!strcmp(cmd, "channels")) {
@@ -177,9 +178,10 @@ open:
 	if (oret < 0)
 		goto out;
 	pod->channels = ov_info(pod->vf, 0)->channels;
-	pod->samplerate = ov_info(pod->vf, 0)->rate;
+	pod->sample_rate = ov_info(pod->vf, 0)->rate;
+	tv_add(now, &(struct timeval)EMBRACE(0, 300 * 1000), &pod->stream_start);
 	PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
-		pod->samplerate);
+		pod->sample_rate);
 	ret = 1;
 out:
 	if (ret <= 0) {
@@ -193,6 +195,20 @@ out:
 	return ret;
 }
 
+static void ogg_pre_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;
+	int ret;
+
+	t->error = 0;
+	ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
+	if (ret < 0)
+		sched_min_delay(s);
+	else
+		sched_request_barrier(&pod->stream_start, s);
+}
+
 static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
@@ -200,6 +216,8 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	struct btr_node *btrn = fn->btrn;
 	int ret, ns;
 
+	if (tv_diff(&pod->stream_start, now, NULL) > 0)
+		return;
 	pod->converted = 0;
 	t->error = 0;
 	ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
@@ -226,7 +244,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_get_output_queue_size(btrn) > 640 * 1024)
+		if (btr_get_output_queue_size(btrn) > 128 * 1024)
 			return; /* enough data for the moment */
 	}
 out:
@@ -245,7 +263,7 @@ void oggdec_filter_init(struct filter *f)
 {
 	f->open = ogg_open;
 	f->close = ogg_close;
-	f->pre_select = generic_filter_pre_select;
+	f->pre_select = ogg_pre_select;
 	f->post_select = ogg_post_select;
 	f->execute = oggdec_execute;
 }