bitstream: Improve documentation.
[paraslash.git] / wmadec_filter.c
index eea2750b82d9a4040c5f63ae6da01db65a50ecd8..fdca2814d76a44db720752e2c99d10d9df7bbe5c 100644 (file)
@@ -17,7 +17,6 @@
 
 #define _XOPEN_SOURCE 600
 
-#include <sys/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,6 +31,7 @@
 #include "ggo.h"
 #include "string.h"
 #include "sched.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "bitstream.h"
 #include "imdct.h"
 #define LSP_POW_BITS 7
 
 struct private_wmadec_data {
+       /** Information contained in the audio file header. */
        struct asf_header_info ahi;
        struct getbit_context gb;
-       int use_bit_reservoir;
-       int use_variable_block_len;
-       int use_exp_vlc;        ///< exponent coding: 0 = lsp, 1 = vlc + delta
-       int use_noise_coding;   ///< true if perceptual noise is added
+       /** Whether perceptual noise is added. */
+       int use_noise_coding;
+       /** Depends on number of the bits per second and the frame length. */
        int byte_offset_bits;
+       /** Only used if ahi->use_exp_vlc is true. */
        struct vlc exp_vlc;
-       int exponent_sizes[BLOCK_NB_SIZES];
        uint16_t exponent_bands[BLOCK_NB_SIZES][25];
-       int high_band_start[BLOCK_NB_SIZES];    ///< index of first coef in high band
-       int coefs_start;        ///< first coded coef
-       int coefs_end[BLOCK_NB_SIZES];  ///< max number of coded coefficients
+       /** The index of the first coef in high band. */
+       int high_band_start[BLOCK_NB_SIZES];
+       /** Maximal number of coded coefficients. */
+       int coefs_end[BLOCK_NB_SIZES];
        int exponent_high_sizes[BLOCK_NB_SIZES];
        int exponent_high_bands[BLOCK_NB_SIZES][HIGH_BAND_MAX_SIZE];
        struct vlc hgain_vlc;
@@ -85,20 +86,31 @@ struct private_wmadec_data {
        uint16_t *run_table[2];
        uint16_t *level_table[2];
        const struct coef_vlc_table *coef_vlcs[2];
-       /* frame info */
-       int frame_len;          ///< frame length in samples
-       int frame_len_bits;     ///< frame_len = 1 << frame_len_bits
-       int nb_block_sizes;     ///< number of block sizes
+       /** Frame length in samples. */
+       int frame_len;
+       /** log2 of frame_len. */
+       int frame_len_bits;
+       /** Number of block sizes, one if !ahi->use_variable_block_len. */
+       int nb_block_sizes;
        /* block info */
        int reset_block_lengths;
-       int block_len_bits;     ///< log2 of current block length
-       int next_block_len_bits;        ///< log2 of next block length
-       int prev_block_len_bits;        ///< log2 of prev block length
-       int block_len;          ///< block length in samples
-       int block_pos;          ///< current position in frame
-       uint8_t ms_stereo;      ///< true if mid/side stereo mode
-       uint8_t channel_coded[MAX_CHANNELS];    ///< true if channel is coded
-       int exponents_bsize[MAX_CHANNELS];      ///< log2 ratio frame/exp. length
+       /** log2 of current block length. */
+       int block_len_bits;
+       /** log2 of next block length. */
+       int next_block_len_bits;
+       /** log2 of previous block length. */
+       int prev_block_len_bits;
+       /** Block length in samples. */
+       int block_len;
+       /** Current position in frame. */
+       int block_pos;
+       /** True if mid/side stereo mode. */
+       uint8_t ms_stereo;
+       /** True if channel is coded. */
+       uint8_t channel_coded[MAX_CHANNELS];
+       /** log2 ratio frame/exp. length. */
+       int exponents_bsize[MAX_CHANNELS];
+
        float exponents[MAX_CHANNELS][BLOCK_MAX_SIZE];
        float max_exponent[MAX_CHANNELS];
        int16_t coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE];
@@ -106,9 +118,9 @@ struct private_wmadec_data {
        float output[BLOCK_MAX_SIZE * 2];
        struct mdct_context *mdct_ctx[BLOCK_NB_SIZES];
        float *windows[BLOCK_NB_SIZES];
-       /* output buffer for one frame and the last for IMDCT windowing */
+       /** Output buffer for one frame and the last for IMDCT windowing. */
        float frame_out[MAX_CHANNELS][BLOCK_MAX_SIZE * 2];
-       /* last frame info */
+       /** Last frame info. */
        uint8_t last_superframe[MAX_CODED_SUPERFRAME_SIZE + 4]; /* padding added */
        int last_bitoffset;
        int last_superframe_len;
@@ -123,15 +135,17 @@ struct private_wmadec_data {
 };
 
 #define EXPVLCBITS 8
-#define EXPMAX ((19 + EXPVLCBITS - 1) / EXPVLCBITS)
+#define EXPMAX DIV_ROUND_UP(19, EXPVLCBITS)
 
 #define HGAINVLCBITS 9
-#define HGAINMAX ((13 + HGAINVLCBITS - 1) / HGAINVLCBITS)
+#define HGAINMAX DIV_ROUND_UP(13, HGAINVLCBITS)
 
 #define VLCBITS 9
-#define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
+#define VLCMAX DIV_ROUND_UP(22, VLCBITS)
+
+/** \cond sine_winows */
 
-#define SINE_WINDOW(x) float sine_ ## x[x] __aligned(16)
+#define SINE_WINDOW(x) static float sine_ ## x[x] __a_aligned(16)
 
 SINE_WINDOW(128);
 SINE_WINDOW(256);
@@ -143,6 +157,7 @@ SINE_WINDOW(4096);
 static float *sine_windows[6] = {
        sine_128, sine_256, sine_512, sine_1024, sine_2048, sine_4096
 };
+/** \endcond sine_windows */
 
 /* Generate a sine window. */
 static void sine_window_init(float *window, int n)
@@ -159,7 +174,7 @@ static void wmadec_cleanup(struct private_wmadec_data *pwd)
 
        for (i = 0; i < pwd->nb_block_sizes; i++)
                imdct_end(pwd->mdct_ctx[i]);
-       if (pwd->use_exp_vlc)
+       if (pwd->ahi.use_exp_vlc)
                free_vlc(&pwd->exp_vlc);
        if (pwd->use_noise_coding)
                free_vlc(&pwd->hgain_vlc);
@@ -208,10 +223,10 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
        int a, b, pos, lpos, k, block_len, i, j, n;
        const uint8_t *table;
 
-       pwd->coefs_start = 0;
        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) {
@@ -226,7 +241,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;
@@ -243,7 +258,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 */
@@ -251,7 +266,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++) {
@@ -286,15 +301,14 @@ static int wma_init(struct private_wmadec_data *pwd)
                return -E_WMA_BAD_PARAMS;
 
        /* compute MDCT block size */
-       if (ahi->sample_rate <= 16000) {
+       if (ahi->sample_rate <= 16000)
                pwd->frame_len_bits = 9;
-       } else if (ahi->sample_rate <= 22050) {
+       else if (ahi->sample_rate <= 22050)
                pwd->frame_len_bits = 10;
-       } else {
+       else
                pwd->frame_len_bits = 11;
-       }
        pwd->frame_len = 1 << pwd->frame_len_bits;
-       if (pwd->use_variable_block_len) {
+       if (pwd->ahi.use_variable_block_len) {
                int nb_max, nb;
                nb = ((flags2 >> 3) & 3) + 1;
                if ((ahi->bit_rate / ahi->channels) >= 32000)
@@ -349,24 +363,22 @@ static int wma_init(struct private_wmadec_data *pwd)
                        high_freq = high_freq * 0.5;
                else
                        high_freq = high_freq * 0.3;
-       } else if (sample_rate1 == 11025) {
+       } else if (sample_rate1 == 11025)
                high_freq = high_freq * 0.7;
-       else if (sample_rate1 == 8000) {
-               if (bps <= 0.625) {
+       else if (sample_rate1 == 8000) {
+               if (bps <= 0.625)
                        high_freq = high_freq * 0.5;
-               } else if (bps > 0.75) {
+               else if (bps > 0.75)
                        pwd->use_noise_coding = 0;
-               } else {
+               else
                        high_freq = high_freq * 0.65;
-               }
        } else {
-               if (bps >= 0.8) {
+               if (bps >= 0.8)
                        high_freq = high_freq * 0.75;
-               } else if (bps >= 0.6) {
+               else if (bps >= 0.6)
                        high_freq = high_freq * 0.6;
-               } else {
+               else
                        high_freq = high_freq * 0.5;
-               }
        }
        PARA_INFO_LOG("channels=%d sample_rate=%d "
                "bitrate=%d block_align=%d\n",
@@ -377,7 +389,7 @@ static int wma_init(struct private_wmadec_data *pwd)
                pwd->frame_len, bps, bps1,
                high_freq, pwd->byte_offset_bits);
        PARA_INFO_LOG("use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n",
-               pwd->use_noise_coding, pwd->use_exp_vlc, pwd->nb_block_sizes);
+               pwd->use_noise_coding, pwd->ahi.use_exp_vlc, pwd->nb_block_sizes);
 
        compute_scale_factor_band_sizes(pwd, high_freq);
        /* init MDCT windows : simple sinus window */
@@ -392,7 +404,7 @@ static int wma_init(struct private_wmadec_data *pwd)
 
        if (pwd->use_noise_coding) {
                /* init the noise generator */
-               if (pwd->use_exp_vlc)
+               if (pwd->ahi.use_exp_vlc)
                        pwd->noise_mult = 0.02;
                else
                        pwd->noise_mult = 0.04;
@@ -466,10 +478,6 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
                return ret;
        }
 
-       pwd->use_exp_vlc = pwd->ahi.flags2 & 0x0001;
-       pwd->use_bit_reservoir = pwd->ahi.flags2 & 0x0002;
-       pwd->use_variable_block_len = pwd->ahi.flags2 & 0x0004;
-
        ret = wma_init(pwd);
        if (ret < 0)
                return ret;
@@ -486,11 +494,10 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
                        wma_hgain_huffcodes, 2);
        }
 
-       if (pwd->use_exp_vlc) {
+       if (pwd->ahi.use_exp_vlc) {
                PARA_INFO_LOG("using exp_vlc\n");
-               init_vlc(&pwd->exp_vlc, EXPVLCBITS,
-               sizeof(wma_scale_huffbits), wma_scale_huffbits,
-               wma_scale_huffcodes, 4);
+               init_vlc(&pwd->exp_vlc, EXPVLCBITS, sizeof(wma_scale_huffbits),
+                       wma_scale_huffbits, wma_scale_huffcodes, 4);
        } else {
                PARA_INFO_LOG("using curve\n");
                wma_lsp_to_curve_init(pwd, pwd->frame_len);
@@ -585,7 +592,7 @@ static int decode_exp_vlc(struct private_wmadec_data *pwd, int ch)
        while (q < q_end) {
                code = get_vlc(&pwd->gb, pwd->exp_vlc.table, EXPVLCBITS, EXPMAX);
                if (code < 0)
-                       return -1;
+                       return code;
                /* NOTE: this offset is the same as MPEG4 AAC ! */
                last_exp += code - 60;
                /* XXX: use a table */
@@ -714,7 +721,7 @@ static int compute_high_band_values(struct private_wmadec_data *pwd,
                                        pwd->hgain_vlc.table, HGAINVLCBITS,
                                        HGAINMAX);
                                if (code < 0)
-                                       return -1;
+                                       return code;
                                val += code - 18;
                        }
                        pwd->high_band_values[ch][i] = val;
@@ -745,51 +752,28 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
                coefs = pwd->coefs[ch];
                if (!pwd->use_noise_coding) {
                        /* XXX: optimize more */
-                       for (i = 0; i < pwd->coefs_start; i++)
-                               *coefs++ = 0.0;
                        n = nb_coefs[ch];
-                       for (i = 0; i < n; i++) {
-                               *coefs++ =
-                                   coefs1[i] *
-                                   exponents[i << bsize >> esize] *
-                                   mult;
-                       }
+                       for (i = 0; i < n; i++)
+                               *coefs++ = coefs1[i] *
+                                       exponents[i << bsize >> esize] * mult;
                        n = pwd->block_len - pwd->coefs_end[bsize];
                        for (i = 0; i < n; i++)
                                *coefs++ = 0.0;
                        continue;
                }
-               mult1 = mult;
-               /* very low freqs : noise */
-               for (i = 0; i < pwd->coefs_start; i++) {
-                       *coefs++ =
-                           pwd->noise_table[pwd->noise_index] *
-                           exponents[i << bsize >> esize] *
-                           mult1;
-                       pwd->noise_index =
-                           (pwd->noise_index +
-                            1) & (NOISE_TAB_SIZE - 1);
-               }
-
                n1 = pwd->exponent_high_sizes[bsize];
-
                /* compute power of high bands */
                exponents = pwd->exponents[ch] +
-                   (pwd->high_band_start[bsize] << bsize);
-               last_high_band = 0;     /* avoid warning */
+                       (pwd->high_band_start[bsize] << bsize);
+               last_high_band = 0; /* avoid warning */
                for (j = 0; j < n1; j++) {
-                       n = pwd->exponent_high_bands[pwd->
-                                                  frame_len_bits
-                                                  -
-                                                  pwd->
-                                                  block_len_bits]
-                           [j];
+                       n = pwd->exponent_high_bands[
+                               pwd->frame_len_bits - pwd->block_len_bits][j];
                        if (pwd->high_band_coded[ch][j]) {
                                float e2, val;
                                e2 = 0;
                                for (i = 0; i < n; i++) {
-                                       val = exponents[i << bsize
-                                                     >> esize];
+                                       val = exponents[i << bsize >> esize];
                                        e2 += val * val;
                                }
                                exp_power[j] = e2 / n;
@@ -797,116 +781,77 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
                        }
                        exponents += n << bsize;
                }
-
                /* main freqs and high freqs */
-               exponents =
-                   pwd->exponents[ch] +
-                   (pwd->coefs_start << bsize);
+               exponents = pwd->exponents[ch];
                for (j = -1; j < n1; j++) {
-                       if (j < 0) {
-                               n = pwd->high_band_start[bsize] -
-                                   pwd->coefs_start;
-                       } else {
-                               n = pwd->exponent_high_bands[pwd->
-                                                          frame_len_bits
-                                                          -
-                                                          pwd->
-                                                          block_len_bits]
-                                   [j];
-                       }
+                       if (j < 0)
+                               n = pwd->high_band_start[bsize];
+                       else
+                               n = pwd->exponent_high_bands[pwd->frame_len_bits
+                                       - pwd->block_len_bits][j];
                        if (j >= 0 && pwd->high_band_coded[ch][j]) {
                                /* use noise with specified power */
-                               mult1 =
-                                   sqrt(exp_power[j] /
-                                        exp_power
-                                        [last_high_band]);
+                               mult1 = sqrt(exp_power[j]
+                                       / exp_power[last_high_band]);
                                /* XXX: use a table */
-                               mult1 =
-                                   mult1 * pow(10,
-                                               pwd->
-                                               high_band_values
-                                               [ch][j] * 0.05);
-                               mult1 =
-                                   mult1 /
-                                   (pwd->max_exponent[ch] *
-                                    pwd->noise_mult);
+                               mult1 *= pow(10, pwd->high_band_values[ch][j] * 0.05);
+                               mult1 /= (pwd->max_exponent[ch] * pwd->noise_mult);
                                mult1 *= mdct_norm;
                                for (i = 0; i < n; i++) {
-                                       noise =
-                                           pwd->noise_table[pwd->
-                                                          noise_index];
-                                       pwd->noise_index =
-                                           (pwd->noise_index +
-                                            1) &
-                                           (NOISE_TAB_SIZE -
-                                            1);
-                                       *coefs++ =
-                                           noise *
-                                           exponents[i << bsize
-                                                     >> esize]
-                                           * mult1;
+                                       noise = pwd->noise_table[pwd->noise_index];
+                                       pwd->noise_index = (pwd->noise_index + 1)
+                                               & (NOISE_TAB_SIZE - 1);
+                                       *coefs++ = noise * exponents[
+                                               i << bsize >> esize] * mult1;
                                }
                                exponents += n << bsize;
                        } else {
                                /* coded values + small noise */
                                for (i = 0; i < n; i++) {
-                                       noise =
-                                           pwd->noise_table[pwd->
-                                                          noise_index];
-                                       pwd->noise_index =
-                                           (pwd->noise_index +
-                                            1) &
-                                           (NOISE_TAB_SIZE -
-                                            1);
-                                       *coefs++ =
-                                           ((*coefs1++) +
-                                            noise) *
-                                           exponents[i << bsize
-                                                     >> esize]
-                                           * mult;
+                                       noise = pwd->noise_table[pwd->noise_index];
+                                       pwd->noise_index = (pwd->noise_index + 1)
+                                               & (NOISE_TAB_SIZE - 1);
+                                       *coefs++ = ((*coefs1++) + noise) *
+                                               exponents[i << bsize >> esize]
+                                               * mult;
                                }
                                exponents += n << bsize;
                        }
                }
-
-               /* very high freqs : noise */
+               /* very high freqs: noise */
                n = pwd->block_len - pwd->coefs_end[bsize];
-               mult1 =
-                   mult * exponents[((-1 << bsize)) >> esize];
+               mult1 = mult * exponents[((-1 << bsize)) >> esize];
                for (i = 0; i < n; i++) {
-                       *coefs++ =
-                           pwd->noise_table[pwd->noise_index] *
-                           mult1;
-                       pwd->noise_index =
-                           (pwd->noise_index +
-                            1) & (NOISE_TAB_SIZE - 1);
+                       *coefs++ = pwd->noise_table[pwd->noise_index] * mult1;
+                       pwd->noise_index = (pwd->noise_index + 1)
+                               & (NOISE_TAB_SIZE - 1);
                }
        }
 }
 
 /**
- * @return 0 if OK. 1 if last block of frame. return -1 if
- * unrecorrable error.
+ * Returns 0 if OK, 1 if last block of frame, negative on uncorrectable
+ * errors.
  */
 static int wma_decode_block(struct private_wmadec_data *pwd)
 {
-       int n, v, ch, code, bsize;
+       int ret, n, v, ch, code, bsize;
        int coef_nb_bits, total_gain;
        int nb_coefs[MAX_CHANNELS];
 
        /* compute current block length */
-       if (pwd->use_variable_block_len) {
+       if (pwd->ahi.use_variable_block_len) {
                n = wma_log2(pwd->nb_block_sizes - 1) + 1;
 
                if (pwd->reset_block_lengths) {
                        pwd->reset_block_lengths = 0;
                        v = get_bits(&pwd->gb, n);
                        if (v >= pwd->nb_block_sizes)
-                               return -1;
+                               return -E_WMA_BLOCK_SIZE;
                        pwd->prev_block_len_bits = pwd->frame_len_bits - v;
                        v = get_bits(&pwd->gb, n);
                        if (v >= pwd->nb_block_sizes)
-                               return -1;
+                               return -E_WMA_BLOCK_SIZE;
                        pwd->block_len_bits = pwd->frame_len_bits - v;
                } else {
                        /* update block lengths */
@@ -915,7 +860,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
                }
                v = get_bits(&pwd->gb, n);
                if (v >= pwd->nb_block_sizes)
-                       return -1;
+                       return -E_WMA_BLOCK_SIZE;
                pwd->next_block_len_bits = pwd->frame_len_bits - v;
        } else {
                /* fixed block len */
@@ -945,8 +890,10 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
        if (!v)
                goto next;
 
-       /* read total gain and extract corresponding number of bits for
-          coef escape coding */
+       /*
+        * Read total gain and extract corresponding number of bits for coef
+        * escape coding.
+        */
        total_gain = 1;
        for (;;) {
                int a = get_bits(&pwd->gb, 7);
@@ -958,23 +905,24 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
        coef_nb_bits = wma_total_gain_to_bits(total_gain);
 
        /* compute number of coefficients */
-       n = pwd->coefs_end[bsize] - pwd->coefs_start;
+       n = pwd->coefs_end[bsize];
        for (ch = 0; ch < pwd->ahi.channels; ch++)
                nb_coefs[ch] = n;
 
-       if (compute_high_band_values(pwd, bsize, nb_coefs) < 0)
-               return -1;
+       ret = compute_high_band_values(pwd, bsize, nb_coefs);
+       if (ret < 0)
+               return ret;
 
        /* exponents can be reused in short blocks. */
        if ((pwd->block_len_bits == pwd->frame_len_bits) || get_bit(&pwd->gb)) {
                for (ch = 0; ch < pwd->ahi.channels; ch++) {
                        if (pwd->channel_coded[ch]) {
-                               if (pwd->use_exp_vlc) {
-                                       if (decode_exp_vlc(pwd, ch) < 0)
-                                               return -1;
-                               } else {
+                               if (pwd->ahi.use_exp_vlc) {
+                                       ret = decode_exp_vlc(pwd, ch);
+                                       if (ret < 0)
+                                               return ret;
+                               } else
                                        decode_exp_lsp(pwd, ch);
-                               }
                                pwd->exponents_bsize[ch] = bsize;
                        }
                }
@@ -1005,7 +953,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
                        code = get_vlc(&pwd->gb, coef_vlc->table,
                                VLCBITS, VLCMAX);
                        if (code < 0)
-                               return -1;
+                               return code;
                        if (code == 1) /* EOB */
                                break;
                        if (code == 0) { /* escape */
@@ -1028,13 +976,10 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
                                break;
                }
        }
-
        compute_mdct_coefficients(pwd, bsize, total_gain, nb_coefs);
-
        if (pwd->ms_stereo && pwd->channel_coded[1]) {
                float a, b;
                int i;
-
                /*
                 * Nominal case for ms stereo: we do it before mdct.
                 *
@@ -1053,12 +998,10 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
                        pwd->coefs[1][i] = a - b;
                }
        }
-
 next:
        for (ch = 0; ch < pwd->ahi.channels; ch++) {
-               int n4, index;
+               int n4, idx;
 
-               n = pwd->block_len;
                n4 = pwd->block_len / 2;
                if (pwd->channel_coded[ch])
                        imdct(pwd->mdct_ctx[bsize], pwd->output, pwd->coefs[ch]);
@@ -1066,8 +1009,8 @@ next:
                        memset(pwd->output, 0, sizeof(pwd->output));
 
                /* multiply by the window and add in the frame */
-               index = (pwd->frame_len / 2) + pwd->block_pos - n4;
-               wma_window(pwd, &pwd->frame_out[ch][index]);
+               idx = (pwd->frame_len / 2) + pwd->block_pos - n4;
+               wma_window(pwd, &pwd->frame_out[ch][idx]);
        }
 
        /* update block number */
@@ -1105,7 +1048,7 @@ static int wma_decode_frame(struct private_wmadec_data *pwd, int16_t *samples)
        for (;;) {
                ret = wma_decode_block(pwd);
                if (ret < 0)
-                       return -1;
+                       return ret;
                if (ret)
                        break;
        }
@@ -1133,7 +1076,6 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 {
        int ret;
        int16_t *samples;
-       static int frame_count;
 
        if (buf_size == 0) {
                pwd->last_superframe_len = 0;
@@ -1144,7 +1086,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
        buf_size = pwd->ahi.block_align;
        samples = data;
        init_get_bits(&pwd->gb, buf, buf_size);
-       if (pwd->use_bit_reservoir) {
+       if (pwd->ahi.use_bit_reservoir) {
                int i, nb_frames, bit_offset, pos, len;
                uint8_t *q;
 
@@ -1184,10 +1126,9 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                         * This frame is stored in the last superframe and in
                         * the current one.
                         */
-                       ret = -E_WMA_DECODE;
-                       if (wma_decode_frame(pwd, samples) < 0)
+                       ret = wma_decode_frame(pwd, samples);
+                       if (ret < 0)
                                goto fail;
-                       frame_count++;
                        samples += pwd->ahi.channels * pwd->frame_len;
                }
 
@@ -1201,10 +1142,9 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 
                pwd->reset_block_lengths = 1;
                for (i = 0; i < nb_frames; i++) {
-                       ret = -E_WMA_DECODE;
-                       if (wma_decode_frame(pwd, samples) < 0)
+                       ret = wma_decode_frame(pwd, samples);
+                       if (ret < 0)
                                goto fail;
-                       frame_count++;
                        samples += pwd->ahi.channels * pwd->frame_len;
                }
 
@@ -1225,16 +1165,14 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                if (pwd->ahi.channels * pwd->frame_len * sizeof(int16_t) > *data_size)
                        goto fail;
                /* single frame decode */
-               ret = -E_WMA_DECODE;
-               if (wma_decode_frame(pwd, samples) < 0)
+               ret = wma_decode_frame(pwd, samples);
+               if (ret < 0)
                        goto fail;
-               frame_count++;
                samples += pwd->ahi.channels * pwd->frame_len;
        }
-       PARA_DEBUG_LOG("frame_count: %d frame_len: %d, block_len: %d, "
-               "outbytes: %zd, eaten: %d\n",
-               frame_count, pwd->frame_len, pwd->block_len,
-               (int8_t *) samples - (int8_t *) data, pwd->ahi.block_align);
+       PARA_DEBUG_LOG("frame_len: %d, block_len: %d, outbytes: %d, eaten: %d\n",
+               pwd->frame_len, pwd->block_len,
+               (int)((int8_t *)samples - (int8_t *)data), pwd->ahi.block_align);
        *data_size = (int8_t *)samples - (int8_t *)data;
        return pwd->ahi.block_align;
 fail:
@@ -1243,37 +1181,6 @@ fail:
        return ret;
 }
 
-static ssize_t wmadec_convert(char *inbuffer, size_t len,
-               struct filter_node *fn)
-{
-       int ret, out_size = fn->bufsize - fn->loaded;
-       struct private_wmadec_data *pwd = fn->private_data;
-
-       if (out_size < 128 * 1024)
-               return 0;
-       if (len <= WMA_FRAME_SKIP)
-               return 0;
-       if (!pwd) {
-               ret = wma_decode_init(inbuffer, len, &pwd);
-               if (ret <= 0)
-                       return ret;
-               fn->private_data = pwd;
-               fn->fc->channels = pwd->ahi.channels;
-               fn->fc->samplerate = pwd->ahi.sample_rate;
-               return pwd->ahi.header_len;
-       }
-       /* skip 31 bytes */
-       if (len <= WMA_FRAME_SKIP + pwd->ahi.block_align)
-               return 0;
-       ret = wma_decode_superframe(pwd, fn->buf + fn->loaded,
-               &out_size, (uint8_t *)inbuffer + WMA_FRAME_SKIP,
-               len - WMA_FRAME_SKIP);
-       if (ret < 0)
-               return ret;
-       fn->loaded += out_size;
-       return ret + WMA_FRAME_SKIP;
-}
-
 static void wmadec_close(struct filter_node *fn)
 {
        struct private_wmadec_data *pwd = fn->private_data;
@@ -1281,18 +1188,83 @@ static void wmadec_close(struct filter_node *fn)
        if (!pwd)
                return;
        wmadec_cleanup(pwd);
-       free(fn->buf);
-       fn->buf = NULL;
        free(fn->private_data);
        fn->private_data = NULL;
 }
 
+static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result)
+{
+       struct filter_node *fn = btr_context(btrn);
+       struct private_wmadec_data *pwd = fn->private_data;
+
+       return decoder_execute(cmd, pwd->ahi.sample_rate, pwd->ahi.channels,
+               result);
+}
+
+#define WMA_OUTPUT_BUFFER_SIZE (128 * 1024)
+
+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;
+       struct private_wmadec_data *pwd = fn->private_data;
+       struct btr_node *btrn = fn->btrn;
+       size_t len;
+       char *in, *out;
+
+next_buffer:
+       converted = 0;
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+       if (ret < 0)
+               goto err;
+       if (ret == 0)
+               return 0;
+       btr_merge(btrn, fn->min_iqs);
+       len = btr_next_buffer(btrn, (char **)&in);
+       ret = -E_WMADEC_EOF;
+       if (len < fn->min_iqs)
+               goto err;
+       if (!pwd) {
+               ret = wma_decode_init(in, len, &pwd);
+               if (ret < 0)
+                       goto err;
+               if (ret == 0) {
+                       fn->min_iqs += 4096;
+                       goto next_buffer;
+               }
+               fn->min_iqs = 2 * (WMA_FRAME_SKIP + pwd->ahi.block_align);
+               fn->private_data = pwd;
+               converted = pwd->ahi.header_len;
+               goto success;
+       }
+       fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
+       if (fn->min_iqs > len)
+               goto success;
+       out_size = WMA_OUTPUT_BUFFER_SIZE;
+       out = para_malloc(out_size);
+       ret = wma_decode_superframe(pwd, out, &out_size,
+               (uint8_t *)in + WMA_FRAME_SKIP, len - WMA_FRAME_SKIP);
+       if (ret < 0) {
+               free(out);
+               goto err;
+       }
+       out = para_realloc(out, out_size);
+       if (out_size > 0)
+               btr_add_output(out, out_size, btrn);
+       converted += ret + WMA_FRAME_SKIP;
+success:
+       btr_consume(btrn, converted);
+       return 0;
+err:
+       assert(ret < 0);
+       btr_remove_node(&fn->btrn);
+       return ret;
+}
+
 static void wmadec_open(struct filter_node *fn)
 {
-       fn->bufsize = 1024 * 1024;
-       fn->buf = para_malloc(fn->bufsize);
        fn->private_data = NULL;
-       fn->loaded = 0;
+       fn->min_iqs = 4096;
 }
 
 /**
@@ -1304,5 +1276,7 @@ void wmadec_filter_init(struct filter *f)
 {
        f->open = wmadec_open;
        f->close = wmadec_close;
-       f->convert = wmadec_convert;
+       f->execute = wmadec_execute;
+       f->pre_select = generic_filter_pre_select;
+       f->post_select = wmadec_post_select;
 }