diff options
Diffstat (limited to 'src/libfaad/data.c')
| -rw-r--r-- | src/libfaad/data.c | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/src/libfaad/data.c b/src/libfaad/data.c index 294f4e487..cac03544b 100644 --- a/src/libfaad/data.c +++ b/src/libfaad/data.c @@ -16,7 +16,7 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: data.c,v 1.1 2002/07/14 23:43:01 miguelfreitas Exp $ +** $Id: data.c,v 1.2 2002/12/16 18:59:57 miguelfreitas Exp $ **/ #include "common.h" @@ -25,7 +25,11 @@ #ifdef LD_DEC extern uint8_t num_swb_512_window[] = { - 0, 0, 0, 35, 35, 36, 30, 30, 0, 0, 0, 0 + 0, 0, 0, 36, 36, 37, 31, 31, 0, 0, 0, 0 +}; +extern uint8_t num_swb_480_window[] = +{ + 0, 0, 0, 35, 35, 37, 30, 30, 0, 0, 0, 0 }; #endif @@ -80,6 +84,13 @@ static uint16_t swb_offset_512_48[] = 92, 100, 112, 124, 136, 148, 164, 184, 208, 236, 268, 300, 332, 364, 396, 428, 460, 512 }; + +static uint16_t swb_offset_480_48[] = +{ + 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 64, 72 ,80 ,88, + 96, 108, 120, 132, 144, 156, 172, 188, 212, 240, 272, 304, 336, 368, 400, + 432, 480 +}; #endif static uint16_t swb_offset_128_48[] = @@ -102,6 +113,13 @@ static uint16_t swb_offset_512_32[] = 88, 96, 108, 120, 132, 144, 160, 176, 192, 212, 236, 260, 288, 320, 352, 384, 416, 448, 480, 512 }; + +static uint16_t swb_offset_480_32[] = +{ + 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 64, 72, 80, + 88, 96, 104, 112, 124, 136, 148, 164, 180, 200, 224, 256, 288, 320, 352, + 384, 416, 448, 480 +}; #endif static uint16_t swb_offset_1024_24[] = @@ -119,6 +137,12 @@ static uint16_t swb_offset_512_24[] = 80, 92, 104, 120, 140, 164, 192, 224, 256, 288, 320, 352, 384, 416, 448, 480, 512 }; + +static uint16_t swb_offset_480_24[] = +{ + 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 52, 60, 68, 80, 92, 104, 120, + 140, 164, 192, 224, 256, 288, 320, 352, 384, 416, 448, 480 +}; #endif static uint16_t swb_offset_128_24[] = @@ -182,6 +206,22 @@ extern uint16_t *swb_offset_512_window[] = 0, /* 11025 */ 0 /* 8000 */ }; + +extern uint16_t *swb_offset_480_window[] = +{ + 0, /* 96000 */ + 0, /* 88200 */ + 0, /* 64000 */ + swb_offset_480_48, /* 48000 */ + swb_offset_480_48, /* 44100 */ + swb_offset_480_32, /* 32000 */ + swb_offset_480_24, /* 24000 */ + swb_offset_480_24, /* 22050 */ + 0, /* 16000 */ + 0, /* 12000 */ + 0, /* 11025 */ + 0 /* 8000 */ +}; #endif extern uint16_t *swb_offset_128_window[] = @@ -220,4 +260,4 @@ extern uint32_t sample_rates[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000 -}; +};
\ No newline at end of file |