Index: apps/codecs/libfaad/kbd_win.h =================================================================== --- apps/codecs/libfaad/kbd_win.h (revision 18809) +++ apps/codecs/libfaad/kbd_win.h (working copy) @@ -37,7 +37,7 @@ #pragma warning(disable:4244) #endif -ALIGN static const real_t kbd_long_1024[] ICONST_ATTR = +ALIGN static const real_t kbd_long_1024[] = { FRAC_CONST(0.00029256153896361), FRAC_CONST(0.00042998567353047), @@ -2030,7 +2030,7 @@ }; #endif -ALIGN static const real_t kbd_short_128[] ICONST_ATTR = +ALIGN static const real_t kbd_short_128[] = { FRAC_CONST(4.3795702929468881e-005), FRAC_CONST(0.00011867384265436617), Index: apps/codecs/libfaad/specrec.c =================================================================== --- apps/codecs/libfaad/specrec.c (revision 18809) +++ apps/codecs/libfaad/specrec.c (working copy) @@ -53,6 +53,10 @@ #include "ssr_fb.h" #endif +//real_t time_out_buf[1024] IBSS_ATTR; +//real_t time_out_buf2[1024] IBSS_ATTR; +real_t time_out_buf3[1024] IBSS_ATTR; +real_t time_out_buf4[1024] IBSS_ATTR; /* static function declarations */ static uint8_t quant_to_spec(NeAACDecHandle hDecoder, @@ -707,7 +711,9 @@ hDecoder->sbr_alloced[hDecoder->fr_ch_ele] = 1; } #endif +DEBUGF("malloc: %d\n", (int)mul*hDecoder->frameLength*sizeof(real_t) ); hDecoder->time_out[channel] = (real_t*)faad_malloc(mul*hDecoder->frameLength*sizeof(real_t)); + //hDecoder->time_out[channel] = time_out_buf; memset(hDecoder->time_out[channel], 0, mul*hDecoder->frameLength*sizeof(real_t)); } #if (defined(PS_DEC) || defined(DRM_PS)) @@ -787,7 +793,7 @@ } } #endif - + DEBUGF("malloc: %d, channel: %d, paired_channel: %d\n", (int)mul*hDecoder->frameLength*sizeof(real_t), channel, paired_channel ); if (hDecoder->time_out[channel] == NULL) { mul = 1; @@ -800,23 +806,30 @@ hDecoder->sbr_alloced[hDecoder->fr_ch_ele] = 1; } #endif + hDecoder->time_out[channel] = (real_t*)faad_malloc(mul*hDecoder->frameLength*sizeof(real_t)); + //hDecoder->time_out[channel] = time_out_buf; memset(hDecoder->time_out[channel], 0, mul*hDecoder->frameLength*sizeof(real_t)); } if (hDecoder->time_out[paired_channel] == NULL) { hDecoder->time_out[paired_channel] = (real_t*)faad_malloc(mul*hDecoder->frameLength*sizeof(real_t)); + //hDecoder->time_out[paired_channel] = time_out_buf2; memset(hDecoder->time_out[paired_channel], 0, mul*hDecoder->frameLength*sizeof(real_t)); } if (hDecoder->fb_intermed[channel] == NULL) { - hDecoder->fb_intermed[channel] = (real_t*)faad_malloc(hDecoder->frameLength*sizeof(real_t)); + DEBUGF("malloc2: %d\n", (int)hDecoder->frameLength*sizeof(real_t)); + + //hDecoder->fb_intermed[channel] = (real_t*)faad_malloc(hDecoder->frameLength*sizeof(real_t)); + hDecoder->fb_intermed[channel] = time_out_buf3; memset(hDecoder->fb_intermed[channel], 0, hDecoder->frameLength*sizeof(real_t)); } if (hDecoder->fb_intermed[paired_channel] == NULL) { - hDecoder->fb_intermed[paired_channel] = (real_t*)faad_malloc(hDecoder->frameLength*sizeof(real_t)); + //hDecoder->fb_intermed[paired_channel] = (real_t*)faad_malloc(hDecoder->frameLength*sizeof(real_t)); + hDecoder->fb_intermed[paired_channel] = time_out_buf4; memset(hDecoder->fb_intermed[paired_channel], 0, hDecoder->frameLength*sizeof(real_t)); }