[Freeswitch-svn] [commit] r3131 - in freeswitch/trunk/libs/codec/gsm: . inc src

[Freeswitch SVN]

Author: mikej
Date: Fri Oct 20 21:32:11 2006
New Revision: 3131

Modified:
   freeswitch/trunk/libs/codec/gsm/inc/private.h
   freeswitch/trunk/libs/codec/gsm/libgsm.vcproj
   freeswitch/trunk/libs/codec/gsm/src/long_term.c
   freeswitch/trunk/libs/codec/gsm/src/preprocess.c
   freeswitch/trunk/libs/codec/gsm/src/rpe.c
   freeswitch/trunk/libs/codec/gsm/src/short_term.c

Log:
tweak warning level up.

Modified: freeswitch/trunk/libs/codec/gsm/inc/private.h
==============================================================================
--- freeswitch/trunk/libs/codec/gsm/inc/private.h	(original)
+++ freeswitch/trunk/libs/codec/gsm/inc/private.h	Fri Oct 20 21:32:11 2006
@@ -33,7 +33,7 @@
 	word		v[9];		/* short_term.c, synthesis	*/
 	word		msr;		/* decoder.c,	Postprocessing	*/
 
-	char		verbose;	/* only used if !NDEBUG		*/
+	int			verbose;	/* only used if !NDEBUG		*/
 	char		fast;		/* only used if FAST		*/
 
 	char		wav_fmt;	/* only used if WAV49 defined	*/

Modified: freeswitch/trunk/libs/codec/gsm/libgsm.vcproj
==============================================================================
--- freeswitch/trunk/libs/codec/gsm/libgsm.vcproj	(original)
+++ freeswitch/trunk/libs/codec/gsm/libgsm.vcproj	Fri Oct 20 21:32:11 2006
@@ -46,9 +46,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4131;4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -107,9 +108,10 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4131;4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

Modified: freeswitch/trunk/libs/codec/gsm/src/long_term.c
==============================================================================
--- freeswitch/trunk/libs/codec/gsm/src/long_term.c	(original)
+++ freeswitch/trunk/libs/codec/gsm/src/long_term.c	Fri Oct 20 21:32:11 2006
@@ -194,7 +194,7 @@
 	/*  Initialization of a working array wt
 	 */
 
-	for (k = 0; k <= 39; k++) wt[k] = SASR( d[k], scal );
+	for (k = 0; k <= 39; k++) wt[k] = (word)SASR( d[k], scal );
 
 	/* Search for the maximum cross-correlation and coding of the LTP lag
 	 */
@@ -231,7 +231,7 @@
 
 		if (L_result > L_max) {
 
-			Nc    = lambda;
+			Nc    = (word)lambda;
 			L_max = L_result;
 		}
 	}

Modified: freeswitch/trunk/libs/codec/gsm/src/preprocess.c
==============================================================================
--- freeswitch/trunk/libs/codec/gsm/src/preprocess.c	(original)
+++ freeswitch/trunk/libs/codec/gsm/src/preprocess.c	Fri Oct 20 21:32:11 2006
@@ -40,7 +40,7 @@
 
 	word       z1 = S->z1;
 	longword L_z2 = S->L_z2;
-	word 	   mp = S->mp;
+	word 	   mp = (word)S->mp;
 
 	word 	   	s1;
 	longword      L_s2;
@@ -59,7 +59,7 @@
 
 	/*  4.2.1   Downscaling of the input signal
 	 */
-		SO = SASR( *s, 3 ) << 2;
+		SO = (word)SASR( *s, 3 ) << 2;
 		s++;
 
 		assert (SO >= -0x4000);	/* downscaled by     */

Modified: freeswitch/trunk/libs/codec/gsm/src/rpe.c
==============================================================================
--- freeswitch/trunk/libs/codec/gsm/src/rpe.c	(original)
+++ freeswitch/trunk/libs/codec/gsm/src/rpe.c	Fri Oct 20 21:32:11 2006
@@ -232,7 +232,7 @@
 	 */
 
 	exp = 0;
-	if (xmaxc > 15) exp = SASR(xmaxc, 3) - 1;
+	if (xmaxc > 15) exp = (word)SASR(xmaxc, 3) - 1;
 	mant = xmaxc - (exp << 3);
 
 	if (mant == 0) {
@@ -283,13 +283,13 @@
 	 */
 
 	exp   = 0;
-	temp  = SASR( xmax, 9 );
+	temp  = (word)SASR( xmax, 9 );
 	itest = 0;
 
 	for (i = 0; i <= 5; i++) {
 
 		itest |= (temp <= 0);
-		temp = SASR( temp, 1 );
+		temp = (word)SASR( temp, 1 );
 
 		assert(exp <= 5);
 		if (itest == 0) exp++;		/* exp = add (exp, 1) */
@@ -333,7 +333,7 @@
 
 		temp = xM[i] << temp1;
 		temp = (word) GSM_MULT( temp, temp2 );
-		temp = SASR(temp, 12);
+		temp = (word)SASR(temp, 12);
 		xMc[i] = temp + 4;		/* see note below */
 	}
 

Modified: freeswitch/trunk/libs/codec/gsm/src/short_term.c
==============================================================================
--- freeswitch/trunk/libs/codec/gsm/src/short_term.c	(original)
+++ freeswitch/trunk/libs/codec/gsm/src/short_term.c	Fri Oct 20 21:32:11 2006
@@ -167,9 +167,9 @@
 
 		if (*LARp < 0) {
 			temp = *LARp == MIN_WORD ? MAX_WORD : -(*LARp);
-			*LARp = - ((temp < 11059) ? temp << 1
-				: ((temp < 20070) ? temp + 11059
-				:  (word) GSM_ADD( temp >> 2, 26112 )));
+			*LARp =(word)( - ((temp < 11059) ? (word)(temp << 1)
+				: ((temp < 20070) ? (word)(temp + 11059)
+				:  (word) GSM_ADD( temp >> 2, 26112 ))));
 		} else {
 			temp  = *LARp;
 			*LARp =    (temp < 11059) ? temp << 1