diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-29 00:34:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-29 00:34:59 +0100 |
| commit | c065255bba62ebef145f80cd8d805ef1a9eca133 (patch) | |
| tree | 675d1241b8488fef70b14a566e59a9070682f08c /libavcodec/sbr.h | |
| parent | 97dece333df07befa4052ed6f5a823ec3103a67d (diff) | |
| parent | 2e626dd5136f4daa244b37284e22483cdc7df1ac (diff) | |
| download | ffmpeg-c065255bba62ebef145f80cd8d805ef1a9eca133.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacenc: Fix LONG_START windowing.
aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
avplay: use the correct array size for stride.
lavc: extend doxy for avcodec_alloc_context3().
APIchanges: mention avcodec_alloc_context()/2/3
avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
aacsbr: ARM NEON optimised sbrdsp functions
aacsbr: align some arrays
aacsbr: move some simdable loops to function pointers
cosmetics: Remove extra newlines at EOF
Conflicts:
libavcodec/utils.c
libavfilter/formats.c
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sbr.h')
| -rw-r--r-- | libavcodec/sbr.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index 69c847ac15..1fe47fcebe 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -32,6 +32,7 @@ #include <stdint.h> #include "fft.h" #include "aacps.h" +#include "sbrdsp.h" /** * Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header. @@ -87,8 +88,8 @@ typedef struct { ///QMF values of the original signal float W[2][32][32][2]; ///QMF output of the HF adjustor - float Y[2][38][64][2]; - float g_temp[42][48]; + DECLARE_ALIGNED(16, float, Y)[2][38][64][2]; + DECLARE_ALIGNED(16, float, g_temp)[42][48]; float q_temp[42][48]; uint8_t s_indexmapped[8][48]; ///Envelope scalefactors @@ -155,15 +156,15 @@ typedef struct { uint8_t patch_num_subbands[6]; uint8_t patch_start_subband[6]; ///QMF low frequency input to the HF generator - float X_low[32][40][2]; + DECLARE_ALIGNED(16, float, X_low)[32][40][2]; ///QMF output of the HF generator - float X_high[64][40][2]; + DECLARE_ALIGNED(16, float, X_high)[64][40][2]; ///QMF values of the reconstructed signal DECLARE_ALIGNED(16, float, X)[2][2][38][64]; ///Zeroth coefficient used to filter the subband signals - float alpha0[64][2]; + DECLARE_ALIGNED(16, float, alpha0)[64][2]; ///First coefficient used to filter the subband signals - float alpha1[64][2]; + DECLARE_ALIGNED(16, float, alpha1)[64][2]; ///Dequantized envelope scalefactors, remapped float e_origmapped[7][48]; ///Dequantized noise scalefactors, remapped @@ -180,6 +181,7 @@ typedef struct { DECLARE_ALIGNED(16, float, qmf_filter_scratch)[5][64]; FFTContext mdct_ana; FFTContext mdct; + SBRDSPContext dsp; } SpectralBandReplication; #endif /* AVCODEC_SBR_H */ |