shithub: aacenc

Download patch

ref: 85ebcbef4f9beaa9075c2ae02d95a3b57dbbb067
parent: 44c8a2788e408b0ed53c5ef0573ce228f823a17c
author: lenox <lenox>
date: Mon Dec 20 09:28:02 EST 1999 

some cleanup


--- a/aac_back_pred.c
+++ b/aac_back_pred.c
@@ -69,7 +69,7 @@
 int thisLineNeedsResetting_mc[MAX_TIME_CHANNELS][FLEN_LONG/2];
 int reset_count_mc[MAX_TIME_CHANNELS];
 
-void PredInit()
+void PredInit(void)
 {
 	int i;
 	for (i=0;i<MAX_TIME_CHANNELS;i++) {
--- a/aac_back_pred.h
+++ b/aac_back_pred.h
@@ -68,7 +68,7 @@
 			 int *reset_group,
 			 int chanNum); 
 
-void PredInit();
+void PredInit(void);
 
 #endif
 
--- a/enc.h
+++ b/enc.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 Header file: enc.h
 
-$Id: enc.h,v 1.2 1999/12/16 19:39:15 menno Exp $
+$Id: enc.h,v 1.3 1999/12/20 14:28:02 lenox Exp $
 
 Authors:
 HP    Heiko Purnhagen, Uni Hannover <purnhage@tnt.uni-hannover.de>
@@ -51,7 +51,7 @@
 /* EncTfFree() */
 /* Free memory allocated by t/f-based encoder core. */
 
-void EncTfFree ();
+void EncTfFree (void);
 
 
 #ifdef __cplusplus
--- a/enc_tf.c
+++ b/enc_tf.c
@@ -71,7 +71,7 @@
 /* EncTfFree() */
 /* Free memory allocated by t/f-based encoder core. */
 
-void EncTfFree ()
+void EncTfFree (void)
 {
 	int chanNum;
 
--- a/encoder.c
+++ b/encoder.c
@@ -275,7 +275,7 @@
 	return FNO_ERROR;
 }
 
-faacVersion *faacEncodeVersion()
+faacVersion *faacEncodeVersion(void)
 {
 	faacVersion *faacv = malloc(sizeof(faacVersion));
 
@@ -630,3 +630,4 @@
 
 
 #endif
+
--- a/psych.c
+++ b/psych.c
@@ -52,9 +52,9 @@
 
 Source file: 
 
-$Id: psych.c,v 1.4 1999/12/16 19:39:15 menno Exp $
-$Id: psych.c,v 1.4 1999/12/16 19:39:15 menno Exp $
-$Id: psych.c,v 1.4 1999/12/16 19:39:15 menno Exp $
+$Id: psych.c,v 1.5 1999/12/20 14:28:02 lenox Exp $
+$Id: psych.c,v 1.5 1999/12/20 14:28:02 lenox Exp $
+$Id: psych.c,v 1.5 1999/12/20 14:28:02 lenox Exp $
 
 **********************************************************************/
 
@@ -61,7 +61,7 @@
 /* CREATED BY :  Bernhard Grill -- August-96  */
 #include <stdlib.h>
 #include <math.h>
-
+#include <memory.h>
 #include "tf_main.h"
 #include "psych.h"
 
--- a/tf_main.h
+++ b/tf_main.h
@@ -136,7 +136,7 @@
   Mdct_in        overlap_select      /* YT 970615 for Son_PP */
 );
 
-void __inline imdct(double in_data[], double out_data[], int len);
+void imdct(double in_data[], double out_data[], int len);
 
 #endif	/* #ifndef _TF_MAIN_H_INCLUDED */
 
--- a/tns.c
+++ b/tns.c
@@ -56,7 +56,7 @@
   int fsIndex=0;
 
   /* Determine if sampling rate is supported */
-  while (samplingRate!=tnsSupportedSamplingRates[fsIndex]) {
+  while ((unsigned long)(samplingRate)!=tnsSupportedSamplingRates[fsIndex]) {
     fsIndex++;
   }
   
@@ -307,6 +307,7 @@
 		kArray[i] = (fabs(kArray[i])>threshold) ? kArray[i] : 0.0;
 		if (kArray[i]!=0.0) return i;
 	}
+return 0; // Avoid compiler warning
 }
 
 /*****************************************************/
--- a/tns.h
+++ b/tns.h
@@ -47,7 +47,7 @@
 /* #defines              */
 /*************************/
 #define TNS_MAX_ORDER 20				   
-#define DEF_TNS_GAIN_THRESH 2 //1.4 //new2
+#define DEF_TNS_GAIN_THRESH 1.4 //new2
 #define DEF_TNS_COEFF_THRESH 0.1
 #define DEF_TNS_COEFF_RES 4
 #define DEF_TNS_RES_OFFSET 3