Mercurial > audlegacy-plugins
diff src/aac/libfaad2/tns.c @ 691:e6c5fdae6e88 trunk
[svn] - oh yes, commit mplayer patches as well
author | nenolod |
---|---|
date | Tue, 20 Feb 2007 06:38:03 -0800 |
parents | 1d8b08df98c3 |
children | f1b6f1b2cdb3 |
line wrap: on
line diff
--- a/src/aac/libfaad2/tns.c Tue Feb 20 06:31:29 2007 -0800 +++ b/src/aac/libfaad2/tns.c Tue Feb 20 06:38:03 2007 -0800 @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com +** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -19,15 +19,10 @@ ** Any non-GPL usage of this software or parts of this software is strictly ** forbidden. ** -** Software using this code must display the following message visibly in or -** on each copy of the software: -** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com" -** in, for example, the about-box or help/startup screen. +** Commercial non-GPL licensing of this software is possible. +** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Nero AG through Mpeg4AAClicense@nero.com. -** -** $Id: tns.c,v 1.38 2006/05/17 18:49:21 menno Exp $ +** $Id: tns.c,v 1.35 2004/09/04 14:56:29 menno Exp $ **/ #include "common.h" @@ -111,11 +106,11 @@ start = min(bottom, max_tns_sfb(sr_index, object_type, (ics->window_sequence == EIGHT_SHORT_SEQUENCE))); start = min(start, ics->max_sfb); - start = min(ics->swb_offset[start], ics->swb_offset_max); + start = ics->swb_offset[start]; end = min(top, max_tns_sfb(sr_index, object_type, (ics->window_sequence == EIGHT_SHORT_SEQUENCE))); end = min(end, ics->max_sfb); - end = min(ics->swb_offset[end], ics->swb_offset_max); + end = ics->swb_offset[end]; size = end - start; if (size <= 0) @@ -165,11 +160,11 @@ start = min(bottom, max_tns_sfb(sr_index, object_type, (ics->window_sequence == EIGHT_SHORT_SEQUENCE))); start = min(start, ics->max_sfb); - start = min(ics->swb_offset[start], ics->swb_offset_max); + start = ics->swb_offset[start]; end = min(top, max_tns_sfb(sr_index, object_type, (ics->window_sequence == EIGHT_SHORT_SEQUENCE))); end = min(end, ics->max_sfb); - end = min(ics->swb_offset[end], ics->swb_offset_max); + end = ics->swb_offset[end]; size = end - start; if (size <= 0) @@ -297,7 +292,7 @@ y = *spectrum; for (j = 0; j < order; j++) - y += MUL_C(state[state_index+j], lpc[j+1]); + y += MUL_C(state[j], lpc[j+1]); /* double ringbuffer state */ state_index--;