summaryrefslogtreecommitdiff
path: root/libavcodec/aacsbr.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2014-08-30 17:27:57 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2014-09-06 20:59:20 +0200
commit87c7fb2b215f306c4b2db42b71d41a7b340e6b7f (patch)
tree8fa15ea8e9a34f7e679d9828798469d6f79f803a /libavcodec/aacsbr.c
parent684d0a0b23dce1f7759a40b1ef5c24eb7d8e9329 (diff)
aacsbr: support hardcoding tables.
For sbr_qmf_window_us there is even a question if it maybe should be fully hardcoded all the time. Since half of it is coded, it ends up in .data and not .bss. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec/aacsbr.c')
-rw-r--r--libavcodec/aacsbr.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 290fb819e7..f550eadefb 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -30,6 +30,7 @@
#include "sbr.h"
#include "aacsbr.h"
#include "aacsbrdata.h"
+#include "aacsbr_tablegen.h"
#include "fft.h"
#include "aacps.h"
#include "sbrdsp.h"
@@ -95,7 +96,6 @@ static void aacsbr_func_ptr_init(AACSBRContext *c);
av_cold void ff_aac_sbr_init(void)
{
- int n;
static const struct {
const void *sbr_codes, *sbr_bits;
const unsigned int table_size, elem_size;
@@ -124,13 +124,7 @@ av_cold void ff_aac_sbr_init(void)
SBR_INIT_VLC_STATIC(8, 592);
SBR_INIT_VLC_STATIC(9, 512);
- for (n = 1; n < 320; n++)
- sbr_qmf_window_us[320 + n] = sbr_qmf_window_us[320 - n];
- sbr_qmf_window_us[384] = -sbr_qmf_window_us[384];
- sbr_qmf_window_us[512] = -sbr_qmf_window_us[512];
-
- for (n = 0; n < 320; n++)
- sbr_qmf_window_ds[n] = sbr_qmf_window_us[2*n];
+ aacsbr_tableinit();
ff_ps_init();
}