audiod: Avoid busy loop if switched off.

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index f14d97c13dec8c2c3fe6660aadb5d7b6d3d2c328..edd33c1db88e6add8f84677fce75bc0ff825334a 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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. */
@@ -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: