diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-16 16:52:01 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-19 12:25:34 +0100 |
| commit | c4f5c2d6f4ffa3f4b56555059000208a6ba47b55 (patch) | |
| tree | f46c4f0d94a1e073ac0dae24fab4d1d972bcb2c6 /libavcodec/mpegaudio.h | |
| parent | ea91e77127229015d23a046f1797d3fc6a33e54d (diff) | |
Move some mpegaudio functions to new mpegaudiodsp subsystem
This separation allows these functions to be used in a cleaner
fashion from other codecs (e.g. qdm2) and simplifies creating
optimised versions of them.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/mpegaudio.h')
| -rw-r--r-- | libavcodec/mpegaudio.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 3422b6df68..c33960e987 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -33,7 +33,6 @@ #include "avcodec.h" #include "get_bits.h" #include "dsputil.h" -#include "dct.h" /* max frame size, in samples */ #define MPA_FRAME_SIZE 1152 @@ -69,7 +68,6 @@ typedef float OUT_INT; #else typedef int16_t OUT_INT; -#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) #endif #if CONFIG_FLOAT @@ -142,11 +140,7 @@ typedef struct MPADecodeContext { int dither_state; int error_recognition; AVCodecContext* avctx; -#if CONFIG_FLOAT - DCTContext dct; -#endif - void (*apply_window_mp3)(MPA_INT *synth_buf, MPA_INT *window, - int *dither_state, OUT_INT *samples, int incr); + MPADSPContext mpadsp; } MPADecodeContext; /* layer 3 huffman tables */ @@ -158,22 +152,6 @@ typedef struct HuffTable { int ff_mpa_l2_select_table(int bitrate, int nb_channels, int freq, int lsf); int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate); -extern MPA_INT ff_mpa_synth_window_fixed[]; -void ff_mpa_synth_init_fixed(MPA_INT *window); -void ff_mpa_synth_filter_fixed(MPA_INT *synth_buf_ptr, int *synth_buf_offset, - MPA_INT *window, int *dither_state, - OUT_INT *samples, int incr, - INTFLOAT sb_samples[SBLIMIT]); - -void ff_mpa_synth_init_float(MPA_INT *window); -void ff_mpa_synth_filter_float(MPADecodeContext *s, - MPA_INT *synth_buf_ptr, int *synth_buf_offset, - MPA_INT *window, int *dither_state, - OUT_INT *samples, int incr, - INTFLOAT sb_samples[SBLIMIT]); - -void ff_mpegaudiodec_init_mmx(MPADecodeContext *s); -void ff_mpegaudiodec_init_altivec(MPADecodeContext *s); /* fast header check for resync */ static inline int ff_mpa_check_header(uint32_t header){ |