oggdec: Introduce a small delay on stream start.
authorAndre Noll <maan@systemlinux.org>
Sun, 4 Jul 2010 21:16:01 +0000 (23:16 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 4 Jul 2010 21:16:01 +0000 (23:16 +0200)
This patch avoids buffer underruns when using the http receiver.

oggdec_filter.c

index 0130afd..541b0b2 100644 (file)
@@ -36,6 +36,7 @@ struct private_oggdec_data {
        unsigned int channels;
        /** Current sample rate in Hz. */
        unsigned int samplerate;
+       struct timeval stream_start;
 };
 
 static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
@@ -178,6 +179,7 @@ open:
                goto out;
        pod->channels = ov_info(pod->vf, 0)->channels;
        pod->samplerate = 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);
        ret = 1;
@@ -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);
@@ -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;
 }