Commit 7640c4a3 authored by Niel van der Westhuizen's avatar Niel van der Westhuizen Committed by Alex Converse

aacdec: Tables for length 480 AAC ELD.

parent 0ee25733
...@@ -2457,7 +2457,7 @@ static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce) ...@@ -2457,7 +2457,7 @@ static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce)
float *in = sce->coeffs; float *in = sce->coeffs;
float *out = sce->ret; float *out = sce->ret;
float *saved = sce->saved; float *saved = sce->saved;
const float *const window = ff_aac_eld_window; const float *const window = ff_aac_eld_window_512;
float *buf = ac->buf_mdct; float *buf = ac->buf_mdct;
int i; int i;
const int n = 512; const int n = 512;
......
This diff is collapsed.
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
*/ */
DECLARE_ALIGNED(32, extern float, ff_aac_kbd_long_1024)[1024]; DECLARE_ALIGNED(32, extern float, ff_aac_kbd_long_1024)[1024];
DECLARE_ALIGNED(32, extern float, ff_aac_kbd_short_128)[128]; 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 /* @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]; ...@@ -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_1024[];
extern const uint8_t ff_aac_num_swb_512 []; 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 []; extern const uint8_t ff_aac_num_swb_128 [];
// @} // @}
...@@ -72,10 +74,12 @@ extern const uint16_t *ff_aac_codebook_vector_idx[]; ...@@ -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_1024[13];
extern const uint16_t * const ff_swb_offset_512 [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 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_1024[13];
extern const uint8_t ff_tns_max_bands_512 [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]; extern const uint8_t ff_tns_max_bands_128 [13];
#endif /* AVCODEC_AACTAB_H */ #endif /* AVCODEC_AACTAB_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment