diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
| commit | e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8 (patch) | |
| tree | 8553b3a4ef8164d14ff1b4a3f67e57cfa1d8908a /libfaad2/sbr_e_nf.h | |
| parent | 2887bacbdb6bd320e4840fd230e92a59cc74b9ae (diff) | |
| download | mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.bz2 mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.xz | |
Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
patch by adland <adland123 at yahoo dot com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13454 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/sbr_e_nf.h')
| -rw-r--r-- | libfaad2/sbr_e_nf.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/libfaad2/sbr_e_nf.h b/libfaad2/sbr_e_nf.h index b1ce35d4e8..f667ffe6f9 100644 --- a/libfaad2/sbr_e_nf.h +++ b/libfaad2/sbr_e_nf.h @@ -23,7 +23,7 @@ ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** ** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 -** $Id: sbr_e_nf.h,v 1.3 2004/06/02 22:59:03 diego Exp $ +** $Id: sbr_e_nf.h,v 1.4 2004/06/23 13:50:51 diego Exp $ ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ **/ @@ -35,23 +35,12 @@ extern "C" { #endif -#ifndef FIXED_POINT -#define P2_TABLE_OFFSET 35 -#define P2_TABLE_MAX 91 -#else -#define P2Q_TABLE_OFFSET 24 -#define P2Q_TABLE_MAX 7 -#define P2_TABLE_OFFSET 0 -#define P2_TABLE_MAX 31 -#endif -#define P2_TABLE_RCP_OFFSET 12 -#define P2_TABLE_RCP_MAX 21 - - void extract_envelope_data(sbr_info *sbr, uint8_t ch); void extract_noise_floor_data(sbr_info *sbr, uint8_t ch); +#ifndef FIXED_POINT void envelope_noise_dequantisation(sbr_info *sbr, uint8_t ch); void unmap_envelope_noise(sbr_info *sbr); +#endif #ifdef __cplusplus } |