diff options
Diffstat (limited to 'apps/codecs/libfaad/sbr_dec.c')
-rw-r--r-- | apps/codecs/libfaad/sbr_dec.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/apps/codecs/libfaad/sbr_dec.c b/apps/codecs/libfaad/sbr_dec.c index 04752d793b..c18ea454d5 100644 --- a/apps/codecs/libfaad/sbr_dec.c +++ b/apps/codecs/libfaad/sbr_dec.c | |||
@@ -226,16 +226,17 @@ static void sbr_save_matrix(sbr_info *sbr, uint8_t ch) | |||
226 | } | 226 | } |
227 | } | 227 | } |
228 | 228 | ||
229 | #ifdef SBR_LOW_POWER | ||
230 | ALIGN real_t deg[64]; | ||
231 | #endif | ||
232 | |||
229 | static void sbr_process_channel(sbr_info *sbr, real_t *channel_buf, qmf_t X[MAX_NTSR][64], | 233 | static void sbr_process_channel(sbr_info *sbr, real_t *channel_buf, qmf_t X[MAX_NTSR][64], |
230 | uint8_t ch, uint8_t dont_process, | 234 | uint8_t ch, uint8_t dont_process, |
231 | const uint8_t downSampledSBR) | 235 | const uint8_t downSampledSBR) |
232 | { | 236 | { |
233 | int16_t k, l; | 237 | int16_t k, l; |
234 | 238 | ||
235 | #ifdef SBR_LOW_POWER | 239 | (void)downSampledSBR; |
236 | ALIGN real_t deg[64]; | ||
237 | #endif | ||
238 | |||
239 | #ifdef DRM | 240 | #ifdef DRM |
240 | if (sbr->Is_DRM_SBR) | 241 | if (sbr->Is_DRM_SBR) |
241 | { | 242 | { |
@@ -369,12 +370,12 @@ static void sbr_process_channel(sbr_info *sbr, real_t *channel_buf, qmf_t X[MAX_ | |||
369 | } | 370 | } |
370 | } | 371 | } |
371 | 372 | ||
373 | ALIGN qmf_t X[MAX_NTSR][64]; | ||
372 | uint8_t sbrDecodeCoupleFrame(sbr_info *sbr, real_t *left_chan, real_t *right_chan, | 374 | uint8_t sbrDecodeCoupleFrame(sbr_info *sbr, real_t *left_chan, real_t *right_chan, |
373 | const uint8_t just_seeked, const uint8_t downSampledSBR) | 375 | const uint8_t just_seeked, const uint8_t downSampledSBR) |
374 | { | 376 | { |
375 | uint8_t dont_process = 0; | 377 | uint8_t dont_process = 0; |
376 | uint8_t ret = 0; | 378 | uint8_t ret = 0; |
377 | ALIGN qmf_t X[MAX_NTSR][64]; | ||
378 | 379 | ||
379 | if (sbr == NULL) | 380 | if (sbr == NULL) |
380 | return 20; | 381 | return 20; |
@@ -452,12 +453,12 @@ uint8_t sbrDecodeCoupleFrame(sbr_info *sbr, real_t *left_chan, real_t *right_cha | |||
452 | return 0; | 453 | return 0; |
453 | } | 454 | } |
454 | 455 | ||
456 | ALIGN qmf_t X[MAX_NTSR][64]; | ||
455 | uint8_t sbrDecodeSingleFrame(sbr_info *sbr, real_t *channel, | 457 | uint8_t sbrDecodeSingleFrame(sbr_info *sbr, real_t *channel, |
456 | const uint8_t just_seeked, const uint8_t downSampledSBR) | 458 | const uint8_t just_seeked, const uint8_t downSampledSBR) |
457 | { | 459 | { |
458 | uint8_t dont_process = 0; | 460 | uint8_t dont_process = 0; |
459 | uint8_t ret = 0; | 461 | uint8_t ret = 0; |
460 | ALIGN qmf_t X[MAX_NTSR][64]; | ||
461 | 462 | ||
462 | if (sbr == NULL) | 463 | if (sbr == NULL) |
463 | return 20; | 464 | return 20; |
@@ -519,6 +520,10 @@ uint8_t sbrDecodeSingleFrame(sbr_info *sbr, real_t *channel, | |||
519 | return 0; | 520 | return 0; |
520 | } | 521 | } |
521 | 522 | ||
523 | |||
524 | ALIGN qmf_t X_left[38][64];// = {{0}}; | ||
525 | ALIGN qmf_t X_right[38][64];// = {{0}}; /* must set this to 0 */ | ||
526 | |||
522 | #if (defined(PS_DEC) || defined(DRM_PS)) | 527 | #if (defined(PS_DEC) || defined(DRM_PS)) |
523 | uint8_t sbrDecodeSingleFramePS(sbr_info *sbr, real_t *left_channel, real_t *right_channel, | 528 | uint8_t sbrDecodeSingleFramePS(sbr_info *sbr, real_t *left_channel, real_t *right_channel, |
524 | const uint8_t just_seeked, const uint8_t downSampledSBR) | 529 | const uint8_t just_seeked, const uint8_t downSampledSBR) |
@@ -526,9 +531,9 @@ uint8_t sbrDecodeSingleFramePS(sbr_info *sbr, real_t *left_channel, real_t *righ | |||
526 | uint8_t l, k; | 531 | uint8_t l, k; |
527 | uint8_t dont_process = 0; | 532 | uint8_t dont_process = 0; |
528 | uint8_t ret = 0; | 533 | uint8_t ret = 0; |
529 | ALIGN qmf_t X_left[38][64] = {{0}}; | ||
530 | ALIGN qmf_t X_right[38][64] = {{0}}; /* must set this to 0 */ | ||
531 | 534 | ||
535 | memset(X_left,0,sizeof(X_left)); | ||
536 | memset(X_right,0,sizeof(X_right)); | ||
532 | if (sbr == NULL) | 537 | if (sbr == NULL) |
533 | return 20; | 538 | return 20; |
534 | 539 | ||