shithub: aacenc

Download patch

ref: 1d31e7667558bb9b802157681c8f50ef47584394
parent: 00412deaec63c803059fe0eb300905c73e401755
author: knik <knik>
date: Mon Nov 24 13:08:28 EST 2003

static prototypes removed from header

--- a/libfaac/filtbank.c
+++ b/libfaac/filtbank.c
@@ -22,7 +22,7 @@
  *                                                                           *
  ****************************************************************************/
 /*
- * $Id: filtbank.c,v 1.11 2003/11/16 05:02:52 stux Exp $
+ * $Id: filtbank.c,v 1.12 2003/11/24 18:06:57 knik Exp $
  */
 
 /*
@@ -42,6 +42,13 @@
 #include "util.h"
 
 #define  TWOPI       2*M_PI
+
+
+static void		CalculateKBDWindow	( double* win, double alpha, int length );
+static double	Izero				( double x);
+static void		MDCT				( FFT_Tables *fft_tables, double *data, int N );
+static void		IMDCT				( FFT_Tables *fft_tables, double *data, int N );
+
 
 
 void FilterBankInit(faacEncHandle hEncoder)
--- a/libfaac/filtbank.h
+++ b/libfaac/filtbank.h
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: filtbank.h,v 1.9 2003/11/16 05:02:52 stux Exp $
+ * $Id: filtbank.h,v 1.10 2003/11/24 18:06:57 knik Exp $
  */
 
 #ifndef FILTBANK_H
@@ -60,12 +60,6 @@
 						int sampleRate,
 						int lowpassFreq,
 						int specLen );
-
-static void		CalculateKBDWindow	( double* win, double alpha, int length );
-static double	Izero				( double x);
-static void		MDCT				( FFT_Tables *fft_tables, double *data, int N );
-static void		IMDCT				( FFT_Tables *fft_tables, double *data, int N );
-
 
 #ifdef __cplusplus
 }
--- a/libfaac/tns.c
+++ b/libfaac/tns.c
@@ -24,7 +24,7 @@
 Copyright (c) 1997.
 **********************************************************************/
 /*
- * $Id: tns.c,v 1.9 2001/09/04 18:39:36 menno Exp $
+ * $Id: tns.c,v 1.10 2003/11/24 18:08:28 knik Exp $
  */
 
 #include <math.h>
@@ -58,6 +58,27 @@
 static unsigned short tnsMaxOrderLongMain = 20;
 static unsigned short tnsMaxOrderLongLow = 12;
 static unsigned short tnsMaxOrderShortMainLow = 7;
+
+
+/*************************/
+/* Function prototypes   */
+/*************************/
+static void Autocorrelation(int maxOrder,        /* Maximum autocorr order */
+                     int dataSize,        /* Size of the data array */
+                     double* data,        /* Data array */
+                     double* rArray);     /* Autocorrelation array */
+
+static double LevinsonDurbin(int maxOrder,        /* Maximum filter order */
+                      int dataSize,        /* Size of the data array */
+                      double* data,        /* Data array */
+                      double* kArray);     /* Reflection coeff array */
+
+static void StepUp(int fOrder, double* kArray, double* aArray);
+
+static void QuantizeReflectionCoeffs(int fOrder,int coeffRes,double* rArray,int* indexArray);
+static int TruncateCoeffs(int fOrder,double threshold,double* kArray);
+static void TnsFilter(int length,double* spec,TnsFilterData* filter);
+static void TnsInvFilter(int length,double* spec,TnsFilterData* filter);
 
 
 /*****************************************************/
--- a/libfaac/tns.h
+++ b/libfaac/tns.h
@@ -24,7 +24,7 @@
 Copyright (c) 1997.
 **********************************************************************/
 /*
- * $Id: tns.h,v 1.4 2001/09/04 18:39:36 menno Exp $
+ * $Id: tns.h,v 1.5 2003/11/24 18:08:28 knik Exp $
  */
 
 #ifndef TNS_H
@@ -35,25 +35,6 @@
 #endif /* __cplusplus */
 
 
-/*************************/
-/* Function prototypes   */
-/*************************/
-static void Autocorrelation(int maxOrder,        /* Maximum autocorr order */
-                     int dataSize,        /* Size of the data array */
-                     double* data,        /* Data array */
-                     double* rArray);     /* Autocorrelation array */
-
-static double LevinsonDurbin(int maxOrder,        /* Maximum filter order */
-                      int dataSize,        /* Size of the data array */
-                      double* data,        /* Data array */
-                      double* kArray);     /* Reflection coeff array */
-
-static void StepUp(int fOrder, double* kArray, double* aArray);
-
-static void QuantizeReflectionCoeffs(int fOrder,int coeffRes,double* rArray,int* indexArray);
-static int TruncateCoeffs(int fOrder,double threshold,double* kArray);
-static void TnsFilter(int length,double* spec,TnsFilterData* filter);
-static void TnsInvFilter(int length,double* spec,TnsFilterData* filter);
 void TnsInit(faacEncHandle hEncoder);
 void TnsEncode(TnsInfo* tnsInfo, int numberOfBands,int maxSfb,enum WINDOW_TYPE blockType,
                int* sfbOffsetTable,double* spec);