summaryrefslogtreecommitdiff
path: root/libavcodec/aac.h
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2010-03-08 04:33:02 +0000
committerAlex Converse <alex.converse@gmail.com>2010-03-08 04:33:02 +0000
commited492b61dbe64ef8c25eb1e72ac7ca4e9df9bbd6 (patch)
tree7bfa8a074fdb1f4c21ddb4bd3cbd500413e2580c /libavcodec/aac.h
parentf19341e17a0ece29613cc583daaee6ec58aea9c5 (diff)
Add an HE-AAC v1 decoder.
A large portion of this code was orignally authored by Robert Swain. The rest was written by me. Full history is available at: svn://svn.ffmpeg.org/soc/aac-sbr http://github.com/aconverse/ffmpeg-heaac/tree/sbr_pub Originally committed as revision 22316 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac.h')
-rw-r--r--libavcodec/aac.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index ec43e5fe99..4779cbfc57 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -34,6 +34,7 @@
#include "dsputil.h"
#include "fft.h"
#include "mpeg4audio.h"
+#include "sbr.h"
#include <stdint.h>
@@ -217,7 +218,7 @@ typedef struct {
uint8_t zeroes[128]; ///< band is not coded (used by encoder)
DECLARE_ALIGNED(16, float, coeffs)[1024]; ///< coefficients for IMDCT
DECLARE_ALIGNED(16, float, saved)[1024]; ///< overlap
- DECLARE_ALIGNED(16, float, ret)[1024]; ///< PCM output
+ DECLARE_ALIGNED(16, float, ret)[2048]; ///< PCM output
PredictorState predictor_state[MAX_PREDICTORS];
} SingleChannelElement;
@@ -233,6 +234,7 @@ typedef struct {
SingleChannelElement ch[2];
// CCE specific
ChannelCoupling coup;
+ SpectralBandReplication sbr;
} ChannelElement;
/**