diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-24 02:41:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-24 02:41:53 +0100 |
| commit | 0bb57f8bf029427059be21a562527dcfa0e264c9 (patch) | |
| tree | 8e6743c4fc1f16f36899bdea87e485735c0d8d59 /libavcodec/aacenc.h | |
| parent | b955d4072e3e563b230c9ab4d6575577a3dc7314 (diff) | |
| parent | 0fec2cb15cc6ff1fcc724c774ec36abadcb7b6ad (diff) | |
| download | ffmpeg-0bb57f8bf029427059be21a562527dcfa0e264c9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove ffmpeg.
aacenc: Simplify windowing
aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples.
aacenc: Deinterleave input samples before processing.
aacenc: Store channel count in AACEncContext.
aacenc: Move Q^3/4 calculation to it's own table
aacenc: Request normalized float samples instead of converting s16 samples to float.
aacpsy: Replace an if with FFMAX in LAME windowing.
aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated.
aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
aacenc: cosmetics: move init() and end() to the bottom of the file.
aacenc: aac_encode_init() cleanup
XWD encoder and decoder
vc1: don't read the interpfrm and bfraction elements for interlaced frames
mxfdec: fix memleak on mxf_read_close()
westwood: split the AUD and VQA demuxers into separate files.
Conflicts:
.gitignore
Changelog
Makefile
configure
doc/ffmpeg.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/aacenc.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/img2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.h')
| -rw-r--r-- | libavcodec/aacenc.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index e48fc18060..d87cc0479b 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -61,9 +61,10 @@ typedef struct AACEncContext { FFTContext mdct1024; ///< long (1024 samples) frame transform context FFTContext mdct128; ///< short (128 samples) frame transform context DSPContext dsp; - int16_t *samples; ///< saved preprocessed input + float *planar_samples[6]; ///< saved preprocessed input int samplerate_index; ///< MPEG-4 samplerate index + int channels; ///< channel count const uint8_t *chan_map; ///< channel configuration map ChannelElement *cpe; ///< channel elements @@ -75,6 +76,12 @@ typedef struct AACEncContext { float lambda; DECLARE_ALIGNED(16, int, qcoefs)[96]; ///< quantized coefficients DECLARE_ALIGNED(32, float, scoefs)[1024]; ///< scaled coefficients + + struct { + float *samples; + } buffer; } AACEncContext; +extern float ff_aac_pow34sf_tab[428]; + #endif /* AVCODEC_AACENC_H */ |