define FLAC metadata types in flac.h

[ffmpeg] / libavcodec / wma.h

diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index 138bc9afc8b977a4c30172cc5a42749425b33bcc..fee75620330c4d4a4a8f067260aadd38291a8f5f 100644 (file)
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -1,6 +1,6 @@
 /*
  * WMA compatible codec
- * Copyright (c) 2002-2007 The FFmpeg Project.
+ * Copyright (c) 2002-2007 The FFmpeg Project
  *
  * This file is part of FFmpeg.
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef WMA_H
-#define WMA_H
+#ifndef AVCODEC_WMA_H
+#define AVCODEC_WMA_H
 
 #include "bitstream.h"
 #include "dsputil.h"
@@ -58,7 +58,7 @@ typedef struct CoefVLCTable {
     const uint16_t *levels;     ///< table to build run/level tables
 } CoefVLCTable;
 
-typedef struct WMADecodeContext {
+typedef struct WMACodecContext {
     AVCodecContext* avctx;
     GetBitContext gb;
     PutBitContext pb;
@@ -92,7 +92,7 @@ typedef struct WMADecodeContext {
     uint16_t *run_table[2];
     uint16_t *level_table[2];
     uint16_t *int_table[2];
-    CoefVLCTable *coef_vlcs[2];
+    const CoefVLCTable *coef_vlcs[2];
     /* frame info */
     int frame_len;                          ///< frame length in samples
     int frame_len_bits;                     ///< frame_len = 1 << frame_len_bits
@@ -107,15 +107,14 @@ typedef struct WMADecodeContext {
     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
     DECLARE_ALIGNED_16(float, exponents[MAX_CHANNELS][BLOCK_MAX_SIZE]);
     float max_exponent[MAX_CHANNELS];
     int16_t 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, window[BLOCK_MAX_SIZE * 2]);
     MDCTContext mdct_ctx[BLOCK_NB_SIZES];
     float *windows[BLOCK_NB_SIZES];
-    DECLARE_ALIGNED_16(FFTSample, mdct_tmp[BLOCK_MAX_SIZE]); ///< temporary storage for imdct
     /* output buffer for one frame and the last for IMDCT windowing */
     DECLARE_ALIGNED_16(float, frame_out[MAX_CHANNELS][BLOCK_MAX_SIZE * 2]);
     /* last frame info */
@@ -135,7 +134,7 @@ typedef struct WMADecodeContext {
 #ifdef TRACE
     int frame_count;
 #endif
-} WMADecodeContext;
+} WMACodecContext;
 
 extern const uint16_t ff_wma_hgain_huffcodes[37];
 extern const uint8_t ff_wma_hgain_huffbits[37];
@@ -147,4 +146,4 @@ int ff_wma_init(AVCodecContext * avctx, int flags2);
 int ff_wma_total_gain_to_bits(int total_gain);
 int ff_wma_end(AVCodecContext *avctx);
 
-#endif
+#endif /* AVCODEC_WMA_H */