diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 22:03:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 22:10:21 +0200 |
| commit | 75a9859ac67b60105769fda7160db081216b70f2 (patch) | |
| tree | 520b217f1254806bbe9a2634b9f0ecadb14b2a12 /libavcodec/wma.h | |
| parent | 235d401bfa407806a468379611bd7ed23e5cd0df (diff) | |
| parent | d2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b (diff) | |
| download | ffmpeg-75a9859ac67b60105769fda7160db081216b70f2.tar.gz | |
Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b'
* commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b':
wma: K&R formatting cosmetics
Conflicts:
libavcodec/wma.c
libavcodec/wmadec.c
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.h')
| -rw-r--r-- | libavcodec/wma.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 01244a09fd..66770829ab 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -23,10 +23,11 @@ #define AVCODEC_WMA_H #include "libavutil/float_dsp.h" -#include "get_bits.h" -#include "put_bits.h" + #include "fft.h" #include "fmtconvert.h" +#include "get_bits.h" +#include "put_bits.h" /* size of blocks */ #define BLOCK_MIN_BITS 7 @@ -49,9 +50,9 @@ #define LSP_POW_BITS 7 -//FIXME should be in wmadec +// FIXME should be in wmadec #define VLCBITS 9 -#define VLCMAX ((22+VLCBITS-1)/VLCBITS) +#define VLCMAX ((22 + VLCBITS - 1) / VLCBITS) typedef float WMACoef; ///< type for decoded coefficients, int16_t would be enough for wma 1/2 @@ -64,7 +65,7 @@ typedef struct CoefVLCTable { } CoefVLCTable; typedef struct WMACodecContext { - AVCodecContext* avctx; + AVCodecContext *avctx; GetBitContext gb; PutBitContext pb; int version; ///< 1 = 0x160 (WMAV1), 2 = 0x161 (WMAV2) @@ -88,7 +89,7 @@ typedef struct WMACodecContext { int high_band_values[MAX_CHANNELS][HIGH_BAND_MAX_SIZE]; /* there are two possible tables for spectral coefficients */ -//FIXME the following 3 tables should be shared between decoders +// FIXME the following 3 tables should be shared between decoders VLC coef_vlc[2]; uint16_t *run_table[2]; float *level_table[2]; @@ -135,7 +136,7 @@ typedef struct WMACodecContext { #ifdef TRACE int frame_count; -#endif +#endif /* TRACE */ } WMACodecContext; extern const uint16_t ff_wma_critical_freqs[25]; @@ -145,15 +146,15 @@ extern const float ff_wma_lsp_codebook[NB_LSP_COEFS][16]; extern const uint32_t ff_aac_scalefactor_code[121]; extern const uint8_t ff_aac_scalefactor_bits[121]; -int ff_wma_init(AVCodecContext * avctx, int flags2); +int ff_wma_init(AVCodecContext *avctx, int flags2); int ff_wma_total_gain_to_bits(int total_gain); int ff_wma_end(AVCodecContext *avctx); -unsigned int ff_wma_get_large_val(GetBitContext* gb); -int ff_wma_run_level_decode(AVCodecContext* avctx, GetBitContext* gb, - VLC *vlc, - const float *level_table, const uint16_t *run_table, - int version, WMACoef *ptr, int offset, - int num_coefs, int block_len, int frame_len_bits, +unsigned int ff_wma_get_large_val(GetBitContext *gb); +int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, + VLC *vlc, const float *level_table, + const uint16_t *run_table, int version, + WMACoef *ptr, int offset, int num_coefs, + int block_len, int frame_len_bits, int coef_nb_bits); #endif /* AVCODEC_WMA_H */ |