Merge branch 't/decoder_latency'

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 209c9a4674adfba61f82f8d6e8fac05ec37ccff3..f33f21eb7a63479e87c17cafb1d7fad0f6bce19b 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -112,6 +112,7 @@ next_buffer:
                return;
        btr_merge(btrn, fn->min_iqs);
        len = btr_next_buffer(btrn, (char **)&inbuf);
+       len = PARA_MAX(len, (size_t)8192);
        consumed = 0;
        iqs = btr_get_input_queue_size(btrn);
        if (!padd->initialized) {

diff --git a/buffer_tree.c b/buffer_tree.c
index 1b859f520ebf4aa16d0a13df897395d97da423d9..3a59f8b5e2e20fa20c94117dd31e2655101936cf 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -1067,7 +1067,7 @@ struct btr_node *btr_search_node(const char *name, struct btr_node *root)
 }
 
 /** 640K ought to be enough for everybody ;) */
-#define BTRN_MAX_PENDING (640 * 1024)
+#define BTRN_MAX_PENDING (96 * 1024)
 
 /**
  * Return the current state of a buffer tree node.

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 3344ea4198595e22629b392b2d90041fdee06c8b..35448da7e22f67c84e2fb08d8f1ba6b15de2d49f 100644 (file)
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -140,6 +140,12 @@ next_buffer:
                return;
        btr_merge(btrn, fn->min_iqs);
        len = btr_next_buffer(btrn, &inbuffer);
+       /*
+        * Decode at most 8K in one go to give the post_select() functions of
+        * other buffer tree nodes a chance to run. This is necessary to avoid
+        * buffer underruns on slow machines.
+        */
+       len = PARA_MIN(len, (size_t)8192);
        mad_stream_buffer(&pmd->stream, (unsigned char *)inbuffer, len);
 next_frame:
        ret = mad_header_decode(&pmd->frame.header, &pmd->stream);

diff --git a/oggdec_filter.c b/oggdec_filter.c
index b07d39130bb2dcc8026ffe93cd9e0d5e2ccbf2d0..0130afd04989043430e5c1d70fc11800a6d1f311 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -226,7 +226,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:

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 96fb50082d2bff52ba082904341851048c66c6ef..45fda79e7e7359a0535bd0a932ec03ad944b23fe 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -1279,7 +1279,7 @@ next_buffer:
        }
 success:
        btr_consume(btrn, converted);
-       goto next_buffer;
+       return;
 err:
        assert(ret < 0);
        t->error = ret;