From 88a7f1ff68c48cca7a4872075a2ad4e16dfca95b Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 7 Nov 2009 18:53:35 +0100 Subject: [PATCH] wma: More trivial whitespace cleanups. --- wmadec_filter.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/wmadec_filter.c b/wmadec_filter.c index befc3943..7479e84c 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -61,16 +61,21 @@ struct private_wmadec_data { struct asf_header_info ahi; struct getbit_context gb; + /** Whether to use the bit reservoir. */ int use_bit_reservoir; + /** Whether to use variable block length. */ 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 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_start;///< first coded coef 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]; @@ -895,8 +900,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); @@ -978,13 +985,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. * @@ -1003,7 +1007,6 @@ 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; -- 2.30.2