ref: df2217d210b6e207e56f51058d1cfb356b8af125
parent: 796270817fba1f62a49573b06ab0d8b4a7b33a8c
author: lenox <lenox>
date: Sat Jan 8 08:31:28 EST 2000
some cleanup
--- a/enc_tf.c
+++ b/enc_tf.c
@@ -41,7 +41,7 @@
double *DTimeSigLookAheadBuf[MAX_TIME_CHANNELS+2];
double *nok_tmp_DTimeSigBuf[MAX_TIME_CHANNELS]; /* temporary fix to the buffer size problem. */
-/* static variables used by the T/F mapping */
+/* variables used by the T/F mapping */
enum QC_MOD_SELECT qc_select = AAC_QC; /* later f(encPara) */
enum AAC_PROFILE profile = MAIN;
enum WINDOW_TYPE block_type[MAX_TIME_CHANNELS];
--- a/ms.c
+++ b/ms.c
@@ -68,13 +68,12 @@
int numGroups;
int groupIndex = 0;
int maxSfb;
- int g,b,w, j;
+ int g,b,j;
int use_ms_short;
MS_Info *msInfo;
numGroups = quantInfo[leftChan].num_window_groups;
maxSfb = quantInfo[leftChan].max_sfb;
- w=0;
/* Determine which bands should be enabled */
msInfo = &(channelInfo[leftChan].ms_info);
@@ -135,7 +134,7 @@
int numGroups;
int groupIndex = 0;
int maxSfb;
- int g,b,w, j;
+ int g,b,j;
MS_Info *msInfo;
channelInfo[0].ms_info.is_present = 1;
@@ -143,7 +142,6 @@
for (chan = 0; chan < 2; chan++) {maxSfb = quantInfo[chan].max_sfb;
- w=0;
/* Determine which bands should be enabled */
msInfo = &(channelInfo[leftChan].ms_info);
@@ -178,12 +176,11 @@
int numGroups;
int groupIndex = 0;
int maxSfb;
- int g,b,w, j;
+ int g,b,j;
MS_Info *msInfo;
for (chan = 0; chan < 2; chan++) {maxSfb = quantInfo[chan].max_sfb;
- w=0;
/* Determine which bands should be enabled */
msInfo = &(channelInfo[leftChan].ms_info);
@@ -314,10 +311,10 @@
channelInfo[leftChan].common_window = 1; /* Use common window */
channelInfo[leftChan].ms_info.is_present=1;
+ w = 0;
numGroups = quantInfo[leftChan].num_window_groups;
maxSfb = quantInfo[leftChan].max_sfb;
- w=0;
/* Determine which bands should be enabled */
/* Right now, simply enable bands which do not use intensity stereo */
--- a/nok_ltp_common_internal.h
+++ b/nok_ltp_common_internal.h
@@ -97,19 +97,5 @@
Explanation: - */
typedef double float_ext;
-/*
- Purpose: Codebook for LTP weight coefficients. */
-static double codebook[CODESIZE] =
-{- 0.570829,
- 0.696616,
- 0.813004,
- 0.911304,
- 0.984900,
- 1.067894,
- 1.194601,
- 1.369533
-};
-
#endif /* _NOK_LTP_COMMON_INTERNAL_H */
--- a/nok_ltp_enc.c
+++ b/nok_ltp_enc.c
@@ -34,9 +34,9 @@
/**************************************************************************
Version Control Information Method: CVS
Identifiers:
- $Revision: 1.2 $
- $Date: 2000/01/06 13:55:21 $ (check in)
- $Author: menno $
+ $Revision: 1.3 $
+ $Date: 2000/01/08 13:31:28 $ (check in)
+ $Author: lenox $
*************************************************************************/
@@ -65,7 +65,7 @@
*************************************************************************/
#include "nok_ltp_common_internal.h"
-static short double_to_int (double sig_in);
+short double_to_int (double sig_in);
/**************************************************************************
@@ -348,7 +348,7 @@
>1 otherwise
- weight_idx :
3 bit number indicating the LTP coefficient in
- the codebook
+ the codebook
- sfb_prediction_used:
1 bit for each scalefactor band (sfb) where LTP
can be used indicating whether LTP is switched
@@ -453,7 +453,7 @@
}
}
}
- }
+ }
break;
default:
@@ -487,7 +487,7 @@
Author(s): Juha Ojanpera
*************************************************************************/
-static short
+short
double_to_int (double sig_in)
{short sig_out;
@@ -503,3 +503,4 @@
return (sig_out);
}
+
--- a/nok_pitch.c
+++ b/nok_pitch.c
@@ -34,9 +34,9 @@
/**************************************************************************
Version Control Information Method: CVS
Identifiers:
- $Revision: 1.3 $
- $Date: 2000/01/06 13:55:21 $ (check in)
- $Author: menno $
+ $Revision: 1.4 $
+ $Date: 2000/01/08 13:31:28 $ (check in)
+ $Author: lenox $
*************************************************************************/
@@ -69,9 +69,24 @@
*************************************************************************/
#include "nok_ltp_common_internal.h"
-static void lnqgj (double (*a)[LPC + 1]);
+void lnqgj (double (*a)[LPC + 1]);
-static void w_quantize (double *freq, int *ltp_idx);
+void w_quantize (double *freq, int *ltp_idx);
+
+/*
+ Purpose: Codebook for LTP weight coefficients. */
+
+double codebook[CODESIZE] =
+{+ 0.570829,
+ 0.696616,
+ 0.813004,
+ 0.911304,
+ 0.984900,
+ 1.067894,
+ 1.194601,
+ 1.369533
+};
/**************************************************************************
Title: snr_pred
--- a/psych.c
+++ b/psych.c
@@ -52,9 +52,9 @@
Source file:
-$Id: psych.c,v 1.21 2000/01/07 17:17:56 lenox Exp $
-$Id: psych.c,v 1.21 2000/01/07 17:17:56 lenox Exp $
-$Id: psych.c,v 1.21 2000/01/07 17:17:56 lenox Exp $
+$Id: psych.c,v 1.22 2000/01/08 13:31:28 lenox Exp $
+$Id: psych.c,v 1.22 2000/01/08 13:31:28 lenox Exp $
+$Id: psych.c,v 1.22 2000/01/08 13:31:28 lenox Exp $
**********************************************************************/
@@ -276,9 +276,9 @@
DYN_PART_TABLE_LONG dyn_long;
DYN_PART_TABLE_SHORT dyn_short;
PSY_STATVARIABLE_LONG psy_stvar_long[MAX_TIME_CHANNELS+2];
- /* static variables for long block */
+ /* variables for long block */
PSY_STATVARIABLE_SHORT psy_stvar_short[MAX_TIME_CHANNELS+2];
- /* static variables for short block */
+ /* variables for short block */
/* added by T. Araki (1997.10.16) end */
void EncTf_psycho_acoustic_init( void )
@@ -1054,13 +1054,13 @@
int ch)
{- int b, i,p1,p2;
+ int b, i,p1;//p2;
double t;
double tempL, tempR, tempM, tempS;
p1 = psy_stvar_long->p_nb;
- if( p1 == 0 ) p2 = NPART_LONG;
- else if( p1 == NPART_LONG ) p2 = 0;
+// if( p1 == 0 ) p2 = NPART_LONG;
+// else if( p1 == NPART_LONG ) p2 = 0;
if (ch==3) { for(b = 0; b < part_tbl_long->len; b++) {--- a/tns.c
+++ b/tns.c
@@ -11,9 +11,9 @@
{8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,0};/* Limit bands to > 1.5 kHz */
-/*static unsigned short tnsMinBandNumberLong[12] =
+/* unsigned short tnsMinBandNumberLong[12] =
{ 26, 25, 24, 20, 23, 22, 17, 14, 13, 12, 9, 8 };-static unsigned short tnsMinBandNumberShort[12] =
+ unsigned short tnsMinBandNumberShort[12] =
{ 10, 9, 8, 8, 5, 4, 3, 3, 2, 2, 1, 1 }; *//* Limit bands to > 2.0 kHz */
--- a/transfo.c
+++ b/transfo.c
@@ -19,7 +19,6 @@
fftw_real freq = 2.0 * M_PI / N;
fftw_real fac,cosfreq8,sinfreq8;
int i, n;
- int isign = 1;
int b = N >> 1;
int N4 = N >> 2;
int N2 = N >> 1;