diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:40:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:40:23 +0100 |
| commit | dd72e26d0cea78093324bdc5c0088aa53f2983a2 (patch) | |
| tree | 71f1e9d4241e9a38ca86bea4c362dbd7978da5ef /libavcodec/aactab.h | |
| parent | f53aa3f4f331d845b76c336405435b76dc7204f9 (diff) | |
| parent | 7640c4a371a97899dfb443d980fd0bf8ac587754 (diff) | |
| download | ffmpeg-dd72e26d0cea78093324bdc5c0088aa53f2983a2.tar.gz | |
Merge commit '7640c4a371a97899dfb443d980fd0bf8ac587754'
* commit '7640c4a371a97899dfb443d980fd0bf8ac587754':
aacdec: Tables for length 480 AAC ELD.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aactab.h')
| -rw-r--r-- | libavcodec/aactab.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h index 5ed850888f..9f5a7e47bd 100644 --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@ -46,7 +46,8 @@ */ DECLARE_ALIGNED(32, extern float, ff_aac_kbd_long_1024)[1024]; DECLARE_ALIGNED(32, extern float, ff_aac_kbd_short_128)[128]; -const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window)[1920]; +const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window_512)[1920]; +const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window_480)[1800]; // @} /* @name number of scalefactor window bands for long and short transform windows respectively @@ -54,6 +55,7 @@ const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window)[1920]; */ extern const uint8_t ff_aac_num_swb_1024[]; extern const uint8_t ff_aac_num_swb_512 []; +extern const uint8_t ff_aac_num_swb_480 []; extern const uint8_t ff_aac_num_swb_128 []; // @} @@ -72,10 +74,12 @@ extern const uint16_t *ff_aac_codebook_vector_idx[]; extern const uint16_t * const ff_swb_offset_1024[13]; extern const uint16_t * const ff_swb_offset_512 [13]; +extern const uint16_t * const ff_swb_offset_480 [13]; extern const uint16_t * const ff_swb_offset_128 [13]; extern const uint8_t ff_tns_max_bands_1024[13]; extern const uint8_t ff_tns_max_bands_512 [13]; +extern const uint8_t ff_tns_max_bands_480 [13]; extern const uint8_t ff_tns_max_bands_128 [13]; #endif /* AVCODEC_AACTAB_H */ |