ref: 1bed72165486ab1775fe0428a8426c5b90629331
parent: c83a95dcc328f8e2ea99cb8399fc4cfebf76971d
author: lenox <lenox>
date: Fri Feb 18 04:19:52 EST 2000
cleanup
--- a/aac_qc.c
+++ b/aac_qc.c
@@ -1,5 +1,5 @@
-
-
+#include <math.h>
+#include <string.h>
#include "aacenc.h"
#include "bitstream.h"
#include "tf_main.h"
@@ -6,7 +6,6 @@
#include "pulse.h"
#include "aac_qc.h"
#include "aac_se_enc.h"
-#include <math.h>
#include "hufftab5.h"
--- a/nok_ltp_enc.c
+++ b/nok_ltp_enc.c
@@ -34,9 +34,9 @@
/**************************************************************************
Version Control Information Method: CVS
Identifiers:
- $Revision: 1.6 $
- $Date: 2000/02/17 15:23:37 $ (check in)
- $Author: menno $
+ $Revision: 1.7 $
+ $Date: 2000/02/18 09:19:16 $ (check in)
+ $Author: lenox $
*************************************************************************/
@@ -202,7 +202,7 @@
<_status->weight_idx, lt_status->delay[0], 2 * block_size_long);
/* Transform prediction to frequency domain and save it for subsequent use. */
- buffer2freq (predicted_samples, lt_status->pred_mdct, NULL, win_type, win_shape, WS_SIN, MNON_OVERLAPPED);
+ buffer2freq (predicted_samples, lt_status->pred_mdct, NULL, win_type, WS_SIN, WS_SIN, MNON_OVERLAPPED);
lt_status->side_info = LEN_LTP_DATA_PRESENT + last_band + LEN_LTP_LAG + LEN_LTP_COEF;
@@ -365,8 +365,8 @@
NOK_LT_PRED_STATUS *lt_status, int write_flag)
{int i, last_band;
- int first_subblock;
- int prev_subblock;
+// int first_subblock;
+// int prev_subblock;
int bit_count = 0;
--- a/rateconv.c
+++ b/rateconv.c
@@ -1,7 +1,7 @@
/**********************************************************************
audio sample rate converter
-$Id: rateconv.c,v 1.2 2000/01/31 08:00:38 lenox Exp $
+$Id: rateconv.c,v 1.3 2000/02/18 09:18:27 lenox Exp $
Source file: rateconv.c
@@ -514,7 +514,7 @@
/* -1 = auto */
float fd, /* in: 100dB cutoff freq / input bandwidth */
/* -1 = auto */
- long *numSampleIn) /* out: num input samples / frame */
+ int *numSampleIn) /* out: num input samples / frame */
/* returns: */
/* buffer (handle) */
/* or NULL if error */
@@ -628,7 +628,7 @@
mktp2(tp2,cutoff2,alpha2);
- *numSampleIn = 2*adv;
+ *numSampleIn = (int) 2*adv;
buf->outSize = (long)((2*adv+4)*ratio+4);
buf->out=(float*)malloc(buf->outSize*sizeof(float));
// if (!(buf->out=(float*)malloc(buf->outSize*sizeof(float))))
--- a/rateconv.h
+++ b/rateconv.h
@@ -1,7 +1,7 @@
/**********************************************************************
audio sample rate converter
-$Id: rateconv.h,v 1.1 2000/01/17 21:53:04 menno Exp $
+$Id: rateconv.h,v 1.2 2000/02/18 09:17:28 lenox Exp $
Header file: rateconv.h
@@ -73,7 +73,7 @@
/* -1 = auto */
float fd, /* in: 100dB cutoff freq / input bandwidth */
/* -1 = auto */
- long *numSampleIn); /* out: num input samples / frame */
+ int *numSampleIn); /* out: num input samples / frame */
/* returns: */
/* buffer (handle) */
/* or NULL if error */