aacdec: Decode only one frame per iteration.

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 5c1ea6d395347810ab9216707fd36aaf1b78a365..e1cf802cb0e4c807e8684957424c7237eee787e4 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -35,7 +35,7 @@ struct private_aacdec_data {
        /** the return value of aac_open */
        NeAACDecHandle handle;
        /** whether this instance of the aac decoder is already initialized */
-       int initialized;
+       bool initialized;
        /** number of times the decoder returned an error */
        unsigned error_count;
        /** number of bytes already consumed from the imput stream */
@@ -46,23 +46,6 @@ struct private_aacdec_data {
        unsigned int sample_rate;
 };
 
-/*
- * Get a new libfaad decoder handle.
- *
- * \return The handle returned by NeAACDecOpen().
- */
-static NeAACDecHandle aac_open(void)
-{
-       NeAACDecHandle h = NeAACDecOpen();
-       NeAACDecConfigurationPtr c = NeAACDecGetCurrentConfiguration(h);
-
-       c->defObjectType = LC;
-       c->outputFormat = FAAD_FMT_16BIT;
-       c->downMatrix = 0;
-       NeAACDecSetConfiguration(h, c);
-       return h;
-}
-
 static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 {
        struct filter_node *fn = btr_context(btrn);
@@ -73,11 +56,18 @@ static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 
 static void aacdec_open(struct filter_node *fn)
 {
+       NeAACDecConfigurationPtr c;
        struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
 
+       padd->handle = NeAACDecOpen();
+       c = NeAACDecGetCurrentConfiguration(padd->handle);
+       c->defObjectType = LC;
+       c->outputFormat = FAAD_FMT_16BIT;
+       c->downMatrix = 0;
+       NeAACDecSetConfiguration(padd->handle, c);
+
        fn->private_data = padd;
        fn->min_iqs = 2048;
-       padd->handle = aac_open();
 }
 
 static void aacdec_close(struct filter_node *fn)
@@ -96,7 +86,7 @@ static int aacdec_post_select(__a_unused struct sched *s, void *context)
        struct private_aacdec_data *padd = fn->private_data;
        int i, ret;
        char *inbuf, *outbuf, *btrbuf;
-       size_t len, consumed, loaded;
+       size_t len, consumed, loaded = 0;
        NeAACDecFrameInfo frame_info;
 
 next_buffer:
@@ -124,7 +114,7 @@ next_buffer:
                padd->channels = channels;
                PARA_INFO_LOG("rate: %u, channels: %u\n",
                        padd->sample_rate, padd->channels);
-               padd->initialized = 1;
+               padd->initialized = true;
        }
        if (consumed >= len)
                goto success;
@@ -152,7 +142,6 @@ next_buffer:
        if (!frame_info.samples)
                goto success;
        btrbuf = para_malloc(2 * frame_info.samples);
-       loaded = 0;
        for (i = 0; i < frame_info.samples; i++) {
                short sh = ((short *)outbuf)[i];
                write_int16_host_endian(btrbuf + loaded, sh);
@@ -162,7 +151,9 @@ next_buffer:
 success:
        btr_consume(btrn, consumed);
        padd->consumed_total += consumed;
-       goto next_buffer;
+       if (loaded == 0)
+               goto next_buffer;
+       return 1;
 err:
        assert(ret < 0);
        btr_remove_node(&fn->btrn);