NEWS update.
[paraslash.git] / wmadec_filter.c
index e39dc7f..fdf3da9 100644 (file)
@@ -24,6 +24,7 @@
 #include <math.h>
 #include <string.h>
 #include <regex.h>
 #include <math.h>
 #include <string.h>
 #include <regex.h>
+#include <sys/select.h>
 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"
 struct private_wmadec_data {
        struct asf_header_info ahi;
        struct getbit_context gb;
 struct private_wmadec_data {
        struct asf_header_info ahi;
        struct getbit_context gb;
+       /** Whether to use the bit reservoir. */
        int use_bit_reservoir;
        int use_bit_reservoir;
+       /** Whether to use variable block length. */
        int use_variable_block_len;
        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 to use exponent coding. */
+       int use_exp_vlc;
+       /** Whether perceptual noise is added. */
+       int use_noise_coding;
        int byte_offset_bits;
        struct vlc exp_vlc;
        int exponent_sizes[BLOCK_NB_SIZES];
        uint16_t exponent_bands[BLOCK_NB_SIZES][25];
        int byte_offset_bits;
        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
+       /** The index of the first coef in high band. */
+       int high_band_start[BLOCK_NB_SIZES];
        int coefs_end[BLOCK_NB_SIZES];  ///< max number of coded coefficients
        int exponent_high_sizes[BLOCK_NB_SIZES];
        int exponent_high_bands[BLOCK_NB_SIZES][HIGH_BAND_MAX_SIZE];
        int coefs_end[BLOCK_NB_SIZES];  ///< max number of coded coefficients
        int exponent_high_sizes[BLOCK_NB_SIZES];
        int exponent_high_bands[BLOCK_NB_SIZES][HIGH_BAND_MAX_SIZE];
@@ -87,7 +92,8 @@ struct private_wmadec_data {
        /* frame info */
        int frame_len;          ///< frame length in samples
        int frame_len_bits;     ///< frame_len = 1 << frame_len_bits
        /* 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
+       /** Number of block sizes. */
+       int nb_block_sizes;
        /* block info */
        int reset_block_lengths;
        int block_len_bits;     ///< log2 of current block length
        /* block info */
        int reset_block_lengths;
        int block_len_bits;     ///< log2 of current block length
@@ -130,16 +136,17 @@ struct private_wmadec_data {
 #define VLCBITS 9
 #define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
 
 #define VLCBITS 9
 #define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
 
-DECLARE_ALIGNED(16, float, ff_sine_128[128]);
-DECLARE_ALIGNED(16, float, ff_sine_256[256]);
-DECLARE_ALIGNED(16, float, ff_sine_512[512]);
-DECLARE_ALIGNED(16, float, ff_sine_1024[1024]);
-DECLARE_ALIGNED(16, float, ff_sine_2048[2048]);
-DECLARE_ALIGNED(16, float, ff_sine_4096[4096]);
+#define SINE_WINDOW(x) float sine_ ## x[x] __aligned(16)
 
 
-static float *ff_sine_windows[6] = {
-       ff_sine_128, ff_sine_256, ff_sine_512, ff_sine_1024,
-       ff_sine_2048, ff_sine_4096
+SINE_WINDOW(128);
+SINE_WINDOW(256);
+SINE_WINDOW(512);
+SINE_WINDOW(1024);
+SINE_WINDOW(2048);
+SINE_WINDOW(4096);
+
+static float *sine_windows[6] = {
+       sine_128, sine_256, sine_512, sine_1024, sine_2048, sine_4096
 };
 
 /* Generate a sine window. */
 };
 
 /* Generate a sine window. */
@@ -206,7 +213,6 @@ 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;
 
        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;
 
        for (k = 0; k < pwd->nb_block_sizes; k++) {
                block_len = pwd->frame_len >> k;
 
@@ -284,13 +290,12 @@ static int wma_init(struct private_wmadec_data *pwd)
                return -E_WMA_BAD_PARAMS;
 
        /* compute MDCT block size */
                return -E_WMA_BAD_PARAMS;
 
        /* compute MDCT block size */
-       if (ahi->sample_rate <= 16000) {
+       if (ahi->sample_rate <= 16000)
                pwd->frame_len_bits = 9;
                pwd->frame_len_bits = 9;
-       } else if (ahi->sample_rate <= 22050) {
+       else if (ahi->sample_rate <= 22050)
                pwd->frame_len_bits = 10;
                pwd->frame_len_bits = 10;
-       } else {
+       else
                pwd->frame_len_bits = 11;
                pwd->frame_len_bits = 11;
-       }
        pwd->frame_len = 1 << pwd->frame_len_bits;
        if (pwd->use_variable_block_len) {
                int nb_max, nb;
        pwd->frame_len = 1 << pwd->frame_len_bits;
        if (pwd->use_variable_block_len) {
                int nb_max, nb;
@@ -347,24 +352,22 @@ static int wma_init(struct private_wmadec_data *pwd)
                        high_freq = high_freq * 0.5;
                else
                        high_freq = high_freq * 0.3;
                        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;
                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;
                        high_freq = high_freq * 0.5;
-               } else if (bps > 0.75) {
+               else if (bps > 0.75)
                        pwd->use_noise_coding = 0;
                        pwd->use_noise_coding = 0;
-               } else {
+               else
                        high_freq = high_freq * 0.65;
                        high_freq = high_freq * 0.65;
-               }
        } else {
        } else {
-               if (bps >= 0.8) {
+               if (bps >= 0.8)
                        high_freq = high_freq * 0.75;
                        high_freq = high_freq * 0.75;
-               } else if (bps >= 0.6) {
+               else if (bps >= 0.6)
                        high_freq = high_freq * 0.6;
                        high_freq = high_freq * 0.6;
-               } else {
+               else
                        high_freq = high_freq * 0.5;
                        high_freq = high_freq * 0.5;
-               }
        }
        PARA_INFO_LOG("channels=%d sample_rate=%d "
                "bitrate=%d block_align=%d\n",
        }
        PARA_INFO_LOG("channels=%d sample_rate=%d "
                "bitrate=%d block_align=%d\n",
@@ -382,8 +385,8 @@ static int wma_init(struct private_wmadec_data *pwd)
        for (i = 0; i < pwd->nb_block_sizes; i++) {
                int n;
                n = 1 << (pwd->frame_len_bits - i);
        for (i = 0; i < pwd->nb_block_sizes; i++) {
                int n;
                n = 1 << (pwd->frame_len_bits - i);
-               sine_window_init(ff_sine_windows[pwd->frame_len_bits - i - 7], n);
-               pwd->windows[i] = ff_sine_windows[pwd->frame_len_bits - i - 7];
+               sine_window_init(sine_windows[pwd->frame_len_bits - i - 7], n);
+               pwd->windows[i] = sine_windows[pwd->frame_len_bits - i - 7];
        }
 
        pwd->reset_block_lengths = 1;
        }
 
        pwd->reset_block_lengths = 1;
@@ -480,15 +483,15 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
        if (pwd->use_noise_coding) {
                PARA_INFO_LOG("using noise coding\n");
                init_vlc(&pwd->hgain_vlc, HGAINVLCBITS,
        if (pwd->use_noise_coding) {
                PARA_INFO_LOG("using noise coding\n");
                init_vlc(&pwd->hgain_vlc, HGAINVLCBITS,
-                       sizeof(ff_wma_hgain_huffbits), ff_wma_hgain_huffbits,
-                       ff_wma_hgain_huffcodes, 2);
+                       sizeof(wma_hgain_huffbits), wma_hgain_huffbits,
+                       wma_hgain_huffcodes, 2);
        }
 
        if (pwd->use_exp_vlc) {
                PARA_INFO_LOG("using exp_vlc\n");
                init_vlc(&pwd->exp_vlc, EXPVLCBITS,
        }
 
        if (pwd->use_exp_vlc) {
                PARA_INFO_LOG("using exp_vlc\n");
                init_vlc(&pwd->exp_vlc, EXPVLCBITS,
-               sizeof(ff_wma_scale_huffbits), ff_wma_scale_huffbits,
-               ff_wma_scale_huffcodes, 4);
+               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);
        } else {
                PARA_INFO_LOG("using curve\n");
                wma_lsp_to_curve_init(pwd, pwd->frame_len);
@@ -559,7 +562,7 @@ static void decode_exp_lsp(struct private_wmadec_data *pwd, int ch)
                        val = get_bits(&pwd->gb, 3);
                else
                        val = get_bits(&pwd->gb, 4);
                        val = get_bits(&pwd->gb, 3);
                else
                        val = get_bits(&pwd->gb, 4);
-               lsp_coefs[i] = ff_wma_lsp_codebook[i][val];
+               lsp_coefs[i] = wma_lsp_codebook[i][val];
        }
 
        wma_lsp_to_curve(pwd, pwd->exponents[ch], &pwd->max_exponent[ch],
        }
 
        wma_lsp_to_curve(pwd, pwd->exponents[ch], &pwd->max_exponent[ch],
@@ -583,7 +586,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)
        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 */
                /* NOTE: this offset is the same as MPEG4 AAC ! */
                last_exp += code - 60;
                /* XXX: use a table */
@@ -676,16 +679,161 @@ static int wma_total_gain_to_bits(int total_gain)
                return 9;
 }
 
                return 9;
 }
 
+static int compute_high_band_values(struct private_wmadec_data *pwd,
+               int bsize, int nb_coefs[MAX_CHANNELS])
+{
+       int ch;
+
+       if (!pwd->use_noise_coding)
+               return 0;
+       for (ch = 0; ch < pwd->ahi.channels; ch++) {
+               int i, m, a;
+               if (!pwd->channel_coded[ch])
+                       continue;
+               m = pwd->exponent_high_sizes[bsize];
+               for (i = 0; i < m; i++) {
+                       a = get_bit(&pwd->gb);
+                       pwd->high_band_coded[ch][i] = a;
+                       if (!a)
+                               continue;
+                       nb_coefs[ch] -= pwd->exponent_high_bands[bsize][i];
+               }
+       }
+       for (ch = 0; ch < pwd->ahi.channels; ch++) {
+               int i, n, val;
+               if (!pwd->channel_coded[ch])
+                       continue;
+               n = pwd->exponent_high_sizes[bsize];
+               val = (int)0x80000000;
+               for (i = 0; i < n; i++) {
+                       if (!pwd->high_band_coded[ch][i])
+                               continue;
+                       if (val == (int)0x80000000)
+                               val = get_bits(&pwd->gb, 7) - 19;
+                       else {
+                               int code = get_vlc(&pwd->gb,
+                                       pwd->hgain_vlc.table, HGAINVLCBITS,
+                                       HGAINMAX);
+                               if (code < 0)
+                                       return code;
+                               val += code - 18;
+                       }
+                       pwd->high_band_values[ch][i] = val;
+               }
+       }
+       return 1;
+}
+
+static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
+               int bsize, int total_gain, int nb_coefs[MAX_CHANNELS])
+{
+       int ch;
+       float mdct_norm = 1.0 / (pwd->block_len / 2);
+
+       for (ch = 0; ch < pwd->ahi.channels; ch++) {
+               int16_t *coefs1;
+               float *coefs, *exponents, mult, mult1, noise;
+               int i, j, n, n1, last_high_band, esize;
+               float exp_power[HIGH_BAND_MAX_SIZE];
+
+               if (!pwd->channel_coded[ch])
+                       continue;
+               coefs1 = pwd->coefs1[ch];
+               exponents = pwd->exponents[ch];
+               esize = pwd->exponents_bsize[ch];
+               mult = pow(10, total_gain * 0.05) / pwd->max_exponent[ch];
+               mult *= mdct_norm;
+               coefs = pwd->coefs[ch];
+               if (!pwd->use_noise_coding) {
+                       /* XXX: optimize more */
+                       n = nb_coefs[ch];
+                       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;
+               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 */
+               for (j = 0; j < n1; 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];
+                                       e2 += val * val;
+                               }
+                               exp_power[j] = e2 / n;
+                               last_high_band = j;
+                       }
+                       exponents += n << bsize;
+               }
+               /* main freqs and high freqs */
+               exponents = pwd->exponents[ch];
+               for (j = -1; j < n1; 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]);
+                               /* XXX: use a table */
+                               mult1 = 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;
+                               }
+                               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;
+                               }
+                               exponents += n << bsize;
+                       }
+               }
+               /* very high freqs: noise */
+               n = pwd->block_len - pwd->coefs_end[bsize];
+               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);
+               }
+       }
+}
+
 /**
 /**
- * @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)
 {
  */
 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];
        int coef_nb_bits, total_gain;
        int nb_coefs[MAX_CHANNELS];
-       float mdct_norm;
 
        /* compute current block length */
        if (pwd->use_variable_block_len) {
 
        /* compute current block length */
        if (pwd->use_variable_block_len) {
@@ -695,11 +843,11 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
                        pwd->reset_block_lengths = 0;
                        v = get_bits(&pwd->gb, n);
                        if (v >= pwd->nb_block_sizes)
                        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)
                        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 */
                        pwd->block_len_bits = pwd->frame_len_bits - v;
                } else {
                        /* update block lengths */
@@ -708,7 +856,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
                }
                v = get_bits(&pwd->gb, n);
                if (v >= pwd->nb_block_sizes)
                }
                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 */
                pwd->next_block_len_bits = pwd->frame_len_bits - v;
        } else {
                /* fixed block len */
@@ -738,8 +886,10 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
        if (!v)
                goto next;
 
        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);
        total_gain = 1;
        for (;;) {
                int a = get_bits(&pwd->gb, 7);
@@ -751,70 +901,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 */
        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;
 
        for (ch = 0; ch < pwd->ahi.channels; ch++)
                nb_coefs[ch] = n;
 
-       /* complex coding */
-       if (pwd->use_noise_coding) {
-               for (ch = 0; ch < pwd->ahi.channels; ch++) {
-                       if (pwd->channel_coded[ch]) {
-                               int i, m, a;
-                               m = pwd->exponent_high_sizes[bsize];
-                               for (i = 0; i < m; i++) {
-                                       a = get_bit(&pwd->gb);
-                                       pwd->high_band_coded[ch][i] = a;
-                                       /* if noise coding, the coefficients are not transmitted */
-                                       if (a)
-                                               nb_coefs[ch] -=
-                                                   pwd->
-                                                   exponent_high_bands[bsize]
-                                                   [i];
-                               }
-                       }
-               }
-               for (ch = 0; ch < pwd->ahi.channels; ch++) {
-                       if (pwd->channel_coded[ch]) {
-                               int i, val;
-
-                               n = pwd->exponent_high_sizes[bsize];
-                               val = (int) 0x80000000;
-                               for (i = 0; i < n; i++) {
-                                       if (pwd->high_band_coded[ch][i]) {
-                                               if (val == (int) 0x80000000) {
-                                                       val =
-                                                           get_bits(&pwd->gb,
-                                                                    7) - 19;
-                                               } else {
-                                                       code =
-                                                           get_vlc(&pwd->gb,
-                                                                    pwd->
-                                                                    hgain_vlc.
-                                                                    table,
-                                                                    HGAINVLCBITS,
-                                                                    HGAINMAX);
-                                                       if (code < 0)
-                                                               return -1;
-                                                       val += code - 18;
-                                               }
-                                               pwd->high_band_values[ch][i] =
-                                                   val;
-                                       }
-                               }
-                       }
-               }
-       }
+       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) {
 
        /* 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 {
+                                       ret = decode_exp_vlc(pwd, ch);
+                                       if (ret < 0)
+                                               return ret;
+                               } else
                                        decode_exp_lsp(pwd, ch);
                                        decode_exp_lsp(pwd, ch);
-                               }
                                pwd->exponents_bsize[ch] = bsize;
                        }
                }
                                pwd->exponents_bsize[ch] = bsize;
                        }
                }
@@ -822,217 +926,56 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
 
        /* parse spectral coefficients : just RLE encoding */
        for (ch = 0; ch < pwd->ahi.channels; ch++) {
 
        /* parse spectral coefficients : just RLE encoding */
        for (ch = 0; ch < pwd->ahi.channels; ch++) {
-               if (pwd->channel_coded[ch]) {
-                       struct vlc *coef_vlc;
-                       int level, run, sign, tindex;
-                       int16_t *ptr, *eptr;
-                       const uint16_t *level_table, *run_table;
-
-                       /* special VLC tables are used for ms stereo because
-                          there is potentially less energy there */
-                       tindex = (ch == 1 && pwd->ms_stereo);
-                       coef_vlc = &pwd->coef_vlc[tindex];
-                       run_table = pwd->run_table[tindex];
-                       level_table = pwd->level_table[tindex];
-                       /* XXX: optimize */
-                       ptr = &pwd->coefs1[ch][0];
-                       eptr = ptr + nb_coefs[ch];
-                       memset(ptr, 0, pwd->block_len * sizeof(int16_t));
-                       for (;;) {
-                               code = get_vlc(&pwd->gb, coef_vlc->table,
-                                       VLCBITS, VLCMAX);
-                               if (code < 0)
-                                       return -1;
-                               if (code == 1) /* EOB */
-                                       break;
-                               if (code == 0) { /* escape */
-                                       level = get_bits(&pwd->gb, coef_nb_bits);
-                                       /* reading block_len_bits would be better */
-                                       run = get_bits(&pwd->gb, pwd->frame_len_bits);
-                               } else { /* normal code */
-                                       run = run_table[code];
-                                       level = level_table[code];
-                               }
-                               sign = get_bit(&pwd->gb);
-                               if (!sign)
-                                       level = -level;
-                               ptr += run;
-                               if (ptr >= eptr) {
-                                       PARA_ERROR_LOG("overflow in spectral RLE, ignoring\n");
-                                       break;
-                               }
-                               *ptr++ = level;
-                               if (ptr >= eptr) /* EOB can be omitted */
-                                       break;
-                       }
-               }
-       }
-
-       /* normalize */
-       {
-               int n4 = pwd->block_len / 2;
-               mdct_norm = 1.0 / (float) n4;
-       }
-
-       /* finally compute the MDCT coefficients */
-       for (ch = 0; ch < pwd->ahi.channels; ch++) {
-               if (pwd->channel_coded[ch]) {
-                       int16_t *coefs1;
-                       float *coefs, *exponents, mult, mult1, noise;
-                       int i, j, n1, last_high_band, esize;
-                       float exp_power[HIGH_BAND_MAX_SIZE];
-
-                       coefs1 = pwd->coefs1[ch];
-                       exponents = pwd->exponents[ch];
-                       esize = pwd->exponents_bsize[ch];
-                       mult = pow(10, total_gain * 0.05) / pwd->max_exponent[ch];
-                       mult *= mdct_norm;
-                       coefs = pwd->coefs[ch];
-                       if (pwd->use_noise_coding) {
-                               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);
-                               }
+               struct vlc *coef_vlc;
+               int level, run, tindex;
+               int16_t *ptr, *eptr;
+               const uint16_t *level_table, *run_table;
 
 
-                               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 */
-                               for (j = 0; j < n1; 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];
-                                                       e2 += val * val;
-                                               }
-                                               exp_power[j] = e2 / n;
-                                               last_high_band = j;
-                                       }
-                                       exponents += n << bsize;
-                               }
-
-                               /* main freqs and high freqs */
-                               exponents =
-                                   pwd->exponents[ch] +
-                                   (pwd->coefs_start << bsize);
-                               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 && pwd->high_band_coded[ch][j]) {
-                                               /* use noise with specified power */
-                                               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 *= 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;
-                                               }
-                                               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;
-                                               }
-                                               exponents += n << bsize;
-                                       }
-                               }
-
-                               /* very high freqs : noise */
-                               n = pwd->block_len - pwd->coefs_end[bsize];
-                               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);
-                               }
-                       } else {
-                               /* 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;
-                               }
-                               n = pwd->block_len - pwd->coefs_end[bsize];
-                               for (i = 0; i < n; i++)
-                                       *coefs++ = 0.0;
+               if (!pwd->channel_coded[ch])
+                       continue;
+               /*
+                * special VLC tables are used for ms stereo because there is
+                * potentially less energy there
+                */
+               tindex = (ch == 1 && pwd->ms_stereo);
+               coef_vlc = &pwd->coef_vlc[tindex];
+               run_table = pwd->run_table[tindex];
+               level_table = pwd->level_table[tindex];
+               /* XXX: optimize */
+               ptr = &pwd->coefs1[ch][0];
+               eptr = ptr + nb_coefs[ch];
+               memset(ptr, 0, pwd->block_len * sizeof(int16_t));
+               for (;;) {
+                       code = get_vlc(&pwd->gb, coef_vlc->table,
+                               VLCBITS, VLCMAX);
+                       if (code < 0)
+                               return code;
+                       if (code == 1) /* EOB */
+                               break;
+                       if (code == 0) { /* escape */
+                               level = get_bits(&pwd->gb, coef_nb_bits);
+                               /* reading block_len_bits would be better */
+                               run = get_bits(&pwd->gb, pwd->frame_len_bits);
+                       } else { /* normal code */
+                               run = run_table[code];
+                               level = level_table[code];
+                       }
+                       if (!get_bit(&pwd->gb))
+                               level = -level;
+                       ptr += run;
+                       if (ptr >= eptr) {
+                               PARA_ERROR_LOG("overflow in spectral RLE, ignoring\n");
+                               break;
                        }
                        }
+                       *ptr++ = level;
+                       if (ptr >= eptr) /* EOB can be omitted */
+                               break;
                }
        }
                }
        }
-
+       compute_mdct_coefficients(pwd, bsize, total_gain, nb_coefs);
        if (pwd->ms_stereo && pwd->channel_coded[1]) {
                float a, b;
                int i;
        if (pwd->ms_stereo && pwd->channel_coded[1]) {
                float a, b;
                int i;
-
                /*
                 * Nominal case for ms stereo: we do it before mdct.
                 *
                /*
                 * Nominal case for ms stereo: we do it before mdct.
                 *
@@ -1051,7 +994,6 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
                        pwd->coefs[1][i] = a - b;
                }
        }
                        pwd->coefs[1][i] = a - b;
                }
        }
-
 next:
        for (ch = 0; ch < pwd->ahi.channels; ch++) {
                int n4, index;
 next:
        for (ch = 0; ch < pwd->ahi.channels; ch++) {
                int n4, index;
@@ -1103,7 +1045,7 @@ static int wma_decode_frame(struct private_wmadec_data *pwd, int16_t *samples)
        for (;;) {
                ret = wma_decode_block(pwd);
                if (ret < 0)
        for (;;) {
                ret = wma_decode_block(pwd);
                if (ret < 0)
-                       return -1;
+                       return ret;
                if (ret)
                        break;
        }
                if (ret)
                        break;
        }
@@ -1131,7 +1073,6 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 {
        int ret;
        int16_t *samples;
 {
        int ret;
        int16_t *samples;
-       static int frame_count;
 
        if (buf_size == 0) {
                pwd->last_superframe_len = 0;
 
        if (buf_size == 0) {
                pwd->last_superframe_len = 0;
@@ -1182,10 +1123,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.
                         */
                         * 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;
                                goto fail;
-                       frame_count++;
                        samples += pwd->ahi.channels * pwd->frame_len;
                }
 
                        samples += pwd->ahi.channels * pwd->frame_len;
                }
 
@@ -1199,10 +1139,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++) {
 
                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;
                                goto fail;
-                       frame_count++;
                        samples += pwd->ahi.channels * pwd->frame_len;
                }
 
                        samples += pwd->ahi.channels * pwd->frame_len;
                }
 
@@ -1223,15 +1162,13 @@ 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 */
                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;
                        goto fail;
-               frame_count++;
                samples += pwd->ahi.channels * pwd->frame_len;
        }
                samples += pwd->ahi.channels * pwd->frame_len;
        }
-       PARA_DEBUG_LOG("frame_count: %d frame_len: %d, block_len: %d, "
-               "outbytes: %d, eaten: %d\n",
-               frame_count, pwd->frame_len, pwd->block_len,
+       PARA_DEBUG_LOG("frame_len: %d, block_len: %d, outbytes: %zd, eaten: %d\n",
+               pwd->frame_len, pwd->block_len,
                (int8_t *) samples - (int8_t *) data, pwd->ahi.block_align);
        *data_size = (int8_t *)samples - (int8_t *)data;
        return pwd->ahi.block_align;
                (int8_t *) samples - (int8_t *) data, pwd->ahi.block_align);
        *data_size = (int8_t *)samples - (int8_t *)data;
        return pwd->ahi.block_align;
@@ -1244,10 +1181,10 @@ fail:
 static ssize_t wmadec_convert(char *inbuffer, size_t len,
                struct filter_node *fn)
 {
 static ssize_t wmadec_convert(char *inbuffer, size_t len,
                struct filter_node *fn)
 {
-       int ret, out_size = fn->bufsize - fn->loaded;
+       int ret, converted = 0;
        struct private_wmadec_data *pwd = fn->private_data;
 
        struct private_wmadec_data *pwd = fn->private_data;
 
-       if (out_size < 128 * 1024)
+       if (len <= WMA_FRAME_SKIP)
                return 0;
        if (!pwd) {
                ret = wma_decode_init(inbuffer, len, &pwd);
                return 0;
        if (!pwd) {
                ret = wma_decode_init(inbuffer, len, &pwd);
@@ -1258,16 +1195,22 @@ static ssize_t wmadec_convert(char *inbuffer, size_t len,
                fn->fc->samplerate = pwd->ahi.sample_rate;
                return pwd->ahi.header_len;
        }
                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;
+       for (;;) {
+               int out_size;
+               if (converted + WMA_FRAME_SKIP + pwd->ahi.block_align > len)
+                       break;
+               out_size = fn->bufsize - fn->loaded;
+               if (out_size < 128 * 1024)
+                       break;
+               ret = wma_decode_superframe(pwd, fn->buf + fn->loaded,
+                       &out_size, (uint8_t *)inbuffer + converted + WMA_FRAME_SKIP,
+                       len - WMA_FRAME_SKIP);
+               if (ret < 0)
+                       return ret;
+               fn->loaded += out_size;
+               converted += ret + WMA_FRAME_SKIP;
+       }
+       return converted;
 }
 
 static void wmadec_close(struct filter_node *fn)
 }
 
 static void wmadec_close(struct filter_node *fn)