buffer_tree: Add code to splice out a node of the buffer tree.
[paraslash.git] / wmadec_filter.c
index a03463d465d64e06f47f6a6b8fd37e701bbb138b..b78d762792511890531c891a5027dee563cda195 100644 (file)
@@ -59,6 +59,7 @@
 #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;
        /** Whether to use the bit reservoir. */
@@ -75,7 +76,8 @@ struct private_wmadec_data {
        uint16_t exponent_bands[BLOCK_NB_SIZES][25];
        /** 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
+       /** 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;
@@ -89,21 +91,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
+       /** Frame length in samples. */
+       int frame_len;
+       /** log2 of frame_len. */
+       int frame_len_bits;
        /** Number of block sizes. */
        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];
@@ -111,9 +123,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;
@@ -136,7 +148,7 @@ struct private_wmadec_data {
 #define VLCBITS 9
 #define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
 
-#define SINE_WINDOW(x) float sine_ ## x[x] __aligned(16)
+#define SINE_WINDOW(x) float sine_ ## x[x] __a_aligned(16)
 
 SINE_WINDOW(128);
 SINE_WINDOW(256);
@@ -290,13 +302,12 @@ 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) {
                int nb_max, nb;
@@ -353,24 +364,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",
@@ -1076,7 +1085,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;
@@ -1130,7 +1138,6 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                        ret = wma_decode_frame(pwd, samples);
                        if (ret < 0)
                                goto fail;
-                       frame_count++;
                        samples += pwd->ahi.channels * pwd->frame_len;
                }
 
@@ -1147,7 +1154,6 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                        ret = wma_decode_frame(pwd, samples);
                        if (ret < 0)
                                goto fail;
-                       frame_count++;
                        samples += pwd->ahi.channels * pwd->frame_len;
                }
 
@@ -1171,13 +1177,11 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                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: