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/aacsbrdata.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/aacsbrdata.h')
| -rw-r--r-- | libavcodec/aacsbrdata.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacsbrdata.h b/libavcodec/aacsbrdata.h index 5d33a60888..a796e9deb7 100644 --- a/libavcodec/aacsbrdata.h +++ b/libavcodec/aacsbrdata.h @@ -352,7 +352,8 @@ static DECLARE_ALIGNED(16, float, sbr_qmf_window_us)[640] = { 0.8537385600, }; -static const float sbr_noise_table[512][2] = { +/* First two entries repeated at end to simplify SIMD implementations. */ +const DECLARE_ALIGNED(16, float, ff_sbr_noise_table)[][2] = { {-0.99948153278296, -0.59483417516607}, { 0.97113454393991, -0.67528515225647}, { 0.14130051758487, -0.95090983575689}, {-0.47005496701697, -0.37340549728647}, { 0.80705063769351, 0.29653668284408}, {-0.38981478896926, 0.89572605717087}, @@ -609,6 +610,7 @@ static const float sbr_noise_table[512][2] = { {-0.93412041758744, 0.41374052024363}, { 0.96063943315511, 0.93116709541280}, { 0.97534253457837, 0.86150930812689}, { 0.99642466504163, 0.70190043427512}, {-0.94705089665984, -0.29580042814306}, { 0.91599807087376, -0.98147830385781}, +{-0.99948153278296, -0.59483417516607}, { 0.97113454393991, -0.67528515225647}, }; #endif /* AVCODEC_AACSBRDATA_H */ |