Update of /cvsroot/datatype/aac/codec/fixpt/decoder/real
In directory cvs-new:/tmp/cvs-serv31831/aac/codec/fixpt/decoder/real

Modified Files:
	huffman.c sbr.c sbrhfadj.c sbrside.c stproc.c tns.c 
Log Message:
Warnings removal
Reviewer: jrecker

Index: stproc.c
===================================================================
RCS file: /cvsroot/datatype/aac/codec/fixpt/decoder/real/stproc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- stproc.c	20 May 2005 18:05:41 -0000	1.2
+++ stproc.c	24 May 2005 16:01:55 -0000	1.3
@@ -53,8 +53,8 @@
  * format = Q30
  */
 static const int pow14[2][4] = { 
-	0xc0000000, 0xb3e407d7, 0xa57d8666, 0x945d819b, 
-	0x40000000, 0x4c1bf829, 0x5a82799a, 0x6ba27e65
+	{ 0xc0000000, 0xb3e407d7, 0xa57d8666, 0x945d819b }, 
+	{ 0x40000000, 0x4c1bf829, 0x5a82799a, 0x6ba27e65 }
 };
 
 /**************************************************************************************

Index: sbr.c
===================================================================
RCS file: /cvsroot/datatype/aac/codec/fixpt/decoder/real/sbr.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sbr.c	20 May 2005 18:05:41 -0000	1.2
+++ sbr.c	24 May 2005 16:01:55 -0000	1.3
@@ -72,7 +72,7 @@
 
 	/* clear SBR state structure */
 	c = (unsigned char *)psi;
-	for (i = 0; i < sizeof(PSInfoSBR); i++)
+	for (i = 0; i < (int)sizeof(PSInfoSBR); i++)
 		*c++ = 0;
 
 	/* initialize non-zero state variables */

Index: tns.c
===================================================================
RCS file: /cvsroot/datatype/aac/codec/fixpt/decoder/real/tns.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tns.c	26 Feb 2005 01:47:35 -0000	1.1
+++ tns.c	24 May 2005 16:01:55 -0000	1.2
@@ -133,6 +133,7 @@
 	for (i = 0; i < order; i++)
 		hist[i] = 0;
 
+	sum64.w64 = 0;     /* avoid warning */
 	gbMask = 0;
 	inc = (dir ? -1 : 1);
 	do {

Index: huffman.c
===================================================================
RCS file: /cvsroot/datatype/aac/codec/fixpt/decoder/real/huffman.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- huffman.c	26 Feb 2005 01:47:34 -0000	1.1
+++ huffman.c	24 May 2005 16:01:55 -0000	1.2
@@ -368,7 +368,7 @@
  **************************************************************************************/
 void DecodeSpectrumShort(PSInfoBase *psi, BitStreamInfo *bsi, int ch)
 {
-	int gp, cb, nVals, win, offset, sfb;
+	int gp, cb, nVals=0, win, offset, sfb;
 	const short *sfbTab;
 	unsigned char *sfbCodeBook;
 	int *coef;

Index: sbrhfadj.c
===================================================================
RCS file: /cvsroot/datatype/aac/codec/fixpt/decoder/real/sbrhfadj.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sbrhfadj.c	20 May 2005 18:05:41 -0000	1.2
+++ sbrhfadj.c	24 May 2005 16:01:55 -0000	1.3
@@ -431,7 +431,7 @@
 
 		/* see if gain for this band exceeds max gain */
 		maxFlag = 0;
-		if (gainMax != 0x80000000) {
+		if (gainMax != (int)0x80000000) {
 			if (fbitsGain >= gainMaxFBits) {
 				shift = MIN(fbitsGain - gainMaxFBits, 31);
 				maxFlag = ((gainScale >> shift) > gainMax ? 1 : 0);

Index: sbrside.c
===================================================================
RCS file: /cvsroot/datatype/aac/codec/fixpt/decoder/real/sbrside.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sbrside.c	26 Feb 2005 01:47:35 -0000	1.1
+++ sbrside.c	24 May 2005 16:01:55 -0000	1.2
@@ -152,11 +152,11 @@
  **************************************************************************************/
 static void UnpackSBRGrid(BitStreamInfo *bsi, SBRHeader *sbrHdr, SBRGrid *sbrGrid)
 {
-	int numEnvRaw, env, rel, pBits, border, middleBorder;
+	int numEnvRaw, env, rel, pBits, border, middleBorder=0;
 	unsigned char relBordLead[MAX_NUM_ENV], relBordTrail[MAX_NUM_ENV];
 	unsigned char relBorder0[3], relBorder1[3], relBorder[3];
-	unsigned char numRelBorder0, numRelBorder1, numRelBorder, numRelLead, numRelTrail;
-	unsigned char absBordLead, absBordTrail, absBorder;
+	unsigned char numRelBorder0, numRelBorder1, numRelBorder, numRelLead=0, numRelTrail;
+	unsigned char absBordLead=0, absBordTrail=0, absBorder;
 	
 	sbrGrid->ampResFrame = sbrHdr->ampRes;
 	sbrGrid->frameClass = GetBits(bsi, 2);