From 228ca70d485e2660c2e381d7112cbcca65c156a0 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 2 Jun 2004 22:59:04 +0000
Subject: update to the 2.0 release of faad, patch by adland

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12528 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libfaad2/sbr_e_nf.h | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'libfaad2/sbr_e_nf.h')

diff --git a/libfaad2/sbr_e_nf.h b/libfaad2/sbr_e_nf.h
index bb1bb625e7..1253bc2e24 100644
--- a/libfaad2/sbr_e_nf.h
+++ b/libfaad2/sbr_e_nf.h
@@ -1,6 +1,6 @@
 /*
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003 M. Bakker, Ahead Software 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
@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id: sbr_e_nf.h,v 1.2 2003/09/09 18:09:52 menno Exp $
+** $Id: sbr_e_nf.h,v 1.2 2003/10/03 22:22:27 alex Exp $
 **/
 
 #ifndef __SBR_E_NF_H__
@@ -32,12 +32,25 @@
 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);
 void envelope_noise_dequantisation(sbr_info *sbr, uint8_t ch);
 void unmap_envelope_noise(sbr_info *sbr);
 
-
 #ifdef __cplusplus
 }
 #endif
-- 
cgit v1.2.3