Merge branch 't/buffer_tree_improvements'

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index e58754f5f5658886f8e4d9c238b5093db1980dbe..8b751f04592eff0f7d6b3e5fe73ade1938c17382 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -17,7 +17,6 @@
 
 #define _XOPEN_SOURCE 600
 
-#include <sys/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -75,7 +74,6 @@ struct private_wmadec_data {
        int byte_offset_bits;
        /** Only used if use_exp_vlc is true. */
        struct vlc exp_vlc;
-       int exponent_sizes[BLOCK_NB_SIZES];
        uint16_t exponent_bands[BLOCK_NB_SIZES][25];
        /** The index of the first coef in high band. */
        int high_band_start[BLOCK_NB_SIZES];
@@ -229,8 +227,9 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
        const uint8_t *table;
 
        for (k = 0; k < pwd->nb_block_sizes; k++) {
-               block_len = pwd->frame_len >> k;
+               int exponent_size;
 
+               block_len = pwd->frame_len >> k;
                table = NULL;
                a = pwd->frame_len_bits - BLOCK_MIN_BITS - k;
                if (a < 3) {
@@ -245,7 +244,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
                        n = *table++;
                        for (i = 0; i < n; i++)
                                pwd->exponent_bands[k][i] = table[i];
-                       pwd->exponent_sizes[k] = n;
+                       exponent_size = n;
                } else {
                        j = 0;
                        lpos = 0;
@@ -262,7 +261,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
                                        break;
                                lpos = pos;
                        }
-                       pwd->exponent_sizes[k] = j;
+                       exponent_size = j;
                }
 
                /* max number of coefs */
@@ -270,7 +269,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
                /* high freq computation */
                pwd->high_band_start[k] = (int) ((block_len * 2 * high_freq)
                        / ahi->sample_rate + 0.5);
-               n = pwd->exponent_sizes[k];
+               n = exponent_size;
                j = 0;
                pos = 0;
                for (i = 0; i < n; i++) {
@@ -1211,7 +1210,7 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result)
 
 #define WMA_OUTPUT_BUFFER_SIZE (128 * 1024)
 
-static void wmadec_post_select(__a_unused struct sched *s, struct task *t)
+static int wmadec_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct filter_node *fn = container_of(t, struct filter_node, task);
        int ret, converted, out_size;
@@ -1222,12 +1221,11 @@ static void wmadec_post_select(__a_unused struct sched *s, struct task *t)
 
 next_buffer:
        converted = 0;
-       t->error = 0;
        ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
        if (ret < 0)
                goto err;
        if (ret == 0)
-               return;
+               return 0;
        btr_merge(btrn, fn->min_iqs);
        len = btr_next_buffer(btrn, (char **)&in);
        ret = -E_WMADEC_EOF;
@@ -1263,11 +1261,11 @@ next_buffer:
        converted += ret + WMA_FRAME_SKIP;
 success:
        btr_consume(btrn, converted);
-       return;
+       return 0;
 err:
        assert(ret < 0);
-       t->error = ret;
-       btr_remove_node(btrn);
+       btr_remove_node(&fn->btrn);
+       return ret;
 }
 
 static void wmadec_open(struct filter_node *fn)