Index: patched-ffmpeg-mt/libavcodec/wma.h |
=================================================================== |
--- patched-ffmpeg-mt/libavcodec/wma.h (revision 41250) |
+++ patched-ffmpeg-mt/libavcodec/wma.h (working copy) |
@@ -25,6 +25,7 @@ |
#include "get_bits.h" |
#include "put_bits.h" |
#include "dsputil.h" |
+#include "fft.h" |
/* size of blocks */ |
#define BLOCK_MIN_BITS 7 |
@@ -111,15 +112,15 @@ |
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 |
- DECLARE_ALIGNED_16(float, exponents)[MAX_CHANNELS][BLOCK_MAX_SIZE]; |
+ DECLARE_ALIGNED(16, float, exponents)[MAX_CHANNELS][BLOCK_MAX_SIZE]; |
float max_exponent[MAX_CHANNELS]; |
WMACoef coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE]; |
- DECLARE_ALIGNED_16(float, coefs)[MAX_CHANNELS][BLOCK_MAX_SIZE]; |
- DECLARE_ALIGNED_16(FFTSample, output)[BLOCK_MAX_SIZE * 2]; |
+ DECLARE_ALIGNED(16, float, coefs)[MAX_CHANNELS][BLOCK_MAX_SIZE]; |
+ DECLARE_ALIGNED(16, FFTSample, output)[BLOCK_MAX_SIZE * 2]; |
FFTContext mdct_ctx[BLOCK_NB_SIZES]; |
float *windows[BLOCK_NB_SIZES]; |
/* output buffer for one frame and the last for IMDCT windowing */ |
- DECLARE_ALIGNED_16(float, frame_out)[MAX_CHANNELS][BLOCK_MAX_SIZE * 2]; |
+ DECLARE_ALIGNED(16, float, frame_out)[MAX_CHANNELS][BLOCK_MAX_SIZE * 2]; |
/* last frame info */ |
uint8_t last_superframe[MAX_CODED_SUPERFRAME_SIZE + 4]; /* padding added */ |
int last_bitoffset; |
@@ -143,8 +144,8 @@ |
extern const uint16_t ff_wma_hgain_huffcodes[37]; |
extern const uint8_t ff_wma_hgain_huffbits[37]; |
extern const float ff_wma_lsp_codebook[NB_LSP_COEFS][16]; |
-extern const uint32_t ff_wma_scale_huffcodes[121]; |
-extern const uint8_t ff_wma_scale_huffbits[121]; |
+extern const uint32_t ff_aac_scalefactor_code[121]; |
+extern const uint8_t ff_aac_scalefactor_bits[121]; |
int av_cold ff_wma_get_frame_len_bits(int sample_rate, int version, |
unsigned int decode_flags); |