ref: 7d9c89e84846d71e95fd1517d2c3aa91c94d158b
parent: f8b39149f76c85a5277558b2b64aac7589a7b93a
author: knik <knik>
date: Sat Nov 23 12:32:16 EST 2002
removed static declarations and unused structs
--- a/libfaac/aacquant.h
+++ b/libfaac/aacquant.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: aacquant.h,v 1.4 2001/06/08 18:01:09 menno Exp $
+ * $Id: aacquant.h,v 1.5 2002/11/23 17:32:16 knik Exp $
*/
#ifndef AACQUANT_H
@@ -38,14 +38,6 @@
#define IPOW20(x) pow(2.0,-((double)x)*.1875)
-typedef struct {- int over_count; /* number of quantization noise > masking */
- int tot_count; /* all */
- double over_noise; /* sum of quantization noise > masking */
- double tot_noise; /* sum of all quantization noise */
- double max_noise; /* max quantization noise */
-} calcNoiseResult;
-
void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels);
void AACQuantizeEnd(CoderInfo *coderInfo, unsigned int numChannels);
@@ -56,39 +48,6 @@
int num_cb,
double *xr,
int desired_rate);
-
-static int SearchStepSize(CoderInfo *coderInfo,
- const int desired_rate,
- const double *xr,
- int *xi);
-
-static void Quantize(const double *xr, int *ix, double istep);
-
-static int SortForGrouping(CoderInfo* coderInfo, PsyInfo *psyInfo,
- ChannelInfo *channelInfo, int *sfb_width_table,
- double *xr);
-
-static int CountBitsLong(CoderInfo *coderInfo, int *xi);
-
-static int CountBits(CoderInfo *coderInfo, int *ix, const double *xr);
-
-static int InnerLoop(CoderInfo *coderInfo, double *xr_pow, int *xi, int max_bits);
-
-static void CalcAllowedDist(PsyInfo *psyInfo, int *cb_width, int num_cb,
- double *xr, double *xmin);
-
-static int CalcNoise(CoderInfo *coderInfo, double *xr, int *xi, double *requant_xr,
- double *error_energy, double *xmin, calcNoiseResult *res);
-
-static int OuterLoop(CoderInfo *coderInfo, double *xr, double *xr_pow, int *xi,
- double *xmin, int target_bits);
-
-static int QuantCompare(calcNoiseResult *best,
- calcNoiseResult *calc);
-
-static int BalanceNoise(CoderInfo *coderInfo, double *distort, double *xrpow);
-
-static void AmpScalefacBands(CoderInfo *coderInfo, double *distort, double *xr_pow);
#ifdef __cplusplus
}