diff ac3dec.h @ 8142:f17b1eb9ccd1 libavcodec

revert r15812 (E-AC-3 Spectral Extension) pending further review

--- a/ac3dec.h	Thu Nov 13 19:54:02 2008 +0000
+++ b/ac3dec.h	Thu Nov 13 22:38:38 2008 +0000
@@ -42,11 +42,6 @@
 #define AC3_MAX_COEFS   256
 #define AC3_BLOCK_SIZE  256
 #define MAX_BLOCKS        6
-#define SPX_MAX_BANDS    17
-
-#define INT24_MIN -8388608
-#define INT24_MAX  8388607
-#define M_SQRT_POW2_15 181
 
 typedef struct {
     AVCodecContext *avctx;                  ///< parent context
@@ -93,26 +88,6 @@
     int cpl_coords[AC3_MAX_CHANNELS][18];   ///< coupling coordinates                   (cplco)
 ///@}
 
-///@defgroup spx spectral extension
-///@{
-    int spx_in_use[MAX_BLOCKS];             ///< spectral extension in use              (spxinu)
-    int channel_in_spx[AC3_MAX_CHANNELS];   ///< channel in spectral extension          (chinspx)
-    int spx_atten_code[AC3_MAX_CHANNELS];   ///< spx attenuation code                   (spxattencod)
-    int spx_coords_exist[AC3_MAX_CHANNELS]; ///< indicates if a channel has spx coords  (spxcoe)
-    int spx_start_subband;                  ///< spx beginning frequency band           (spxbegf)
-    int spx_start_freq;                     ///< spx start frequency bin
-    int spx_end_freq;                       ///< spx end frequency bin
-    int spx_copy_start_freq;                ///< spx starting frequency for copying     (copystartmant)
-    int num_spx_subbands;                   ///< number of spectral extension subbands
-    int num_spx_bands;                      ///< number of spectral extension bands     (nspxbnds)
-    uint8_t spx_band_struct[SPX_MAX_BANDS]; ///< spectral extension band structure      (spxbndstrc)
-    int spx_band_sizes[SPX_MAX_BANDS];      ///< number of bins in each band            (spxbndsztab)
-    int first_spx_coords[AC3_MAX_CHANNELS]; ///< first spx coordinates states           (firstspxcos)
-    int spx_noise_blend[AC3_MAX_CHANNELS][SPX_MAX_BANDS];   ///< spx noise blending factor  (nblendfact)
-    int spx_signal_blend[AC3_MAX_CHANNELS][SPX_MAX_BANDS];  ///< spx signal blending factor (sblendfact)
-    int spx_coords[AC3_MAX_CHANNELS][SPX_MAX_BANDS];    ///< spectral extension coordinates (spxco)
-///@}
-
 ///@defgroup aht adaptive hybrid transform
     int channel_uses_aht[AC3_MAX_CHANNELS];                         ///< channel AHT in use (chahtinu)
     int pre_mantissa[AC3_MAX_CHANNELS][AC3_MAX_COEFS][MAX_BLOCKS];  ///< pre-IDCT mantissas
@@ -204,6 +179,4 @@
  */
 void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
 
-void ff_eac3_apply_spectral_extension(AC3DecodeContext *s);
-
 #endif /* AVCODEC_AC3DEC_H */