am 78fc0c0: am 428ece2: am c4aa19a: am ea22778: Merge changes I903353c5,I822dcc74

Jean-Baptiste Queru · Android Git Automerger · commit 0f7f115a5ac2 · 2012-02-24T10:33:05.000-08:00
* commit '78fc0c0bfae913a4a44011225396ae525b335fb1':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
diff --git a/media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp b/media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp
@@ -299,7 +299,7 @@ static Word16 Chebps(Word16 x,
     t0 += (Word32) * (p_f) << 13;
 
 
-    if ((UWord32)(t0 - 0xfe000000L) < 0x01ffffffL -  0xfe000000L)
+    if ((UWord32)(t0 - 0xfe000000L) < (UWord32)0x03ffffffL)
     {
         cheb = (Word16)(t0 >> 10);
     }
diff --git a/media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp b/media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp
@@ -552,10 +552,10 @@ void set_sign12k2(
         else
         {
             *(p_sign--) = -32767;                     /* sign = -1 */
-            cor = - (cor);
+            cor = negate(cor);
 
             /* modify dn[] according to the fixed sign */
-            dn[i] = - val;
+            dn[i] = negate(val);
         }
 
         *(p_en--) = cor;

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ static Word16 Chebps(Word16 x,`
`299`	`299`	`t0 += (Word32) * (p_f) << 13;`
`300`	`300`
`301`	`301`
`302`		`- if ((UWord32)(t0 - 0xfe000000L) < 0x01ffffffL - 0xfe000000L)`
	`302`	`+ if ((UWord32)(t0 - 0xfe000000L) < (UWord32)0x03ffffffL)`
`303`	`303`	`{`
`304`	`304`	`cheb = (Word16)(t0 >> 10);`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -552,10 +552,10 @@ void set_sign12k2(`
`552`	`552`	`else`
`553`	`553`	`{`
`554`	`554`	`(p_sign--) = -32767; / sign = -1 */`
`555`		`- cor = - (cor);`
	`555`	`+ cor = negate(cor);`
`556`	`556`
`557`	`557`	`/* modify dn[] according to the fixed sign */`
`558`		`- dn[i] = - val;`
	`558`	`+ dn[i] = negate(val);`
`559`	`559`	`}`
`560`	`560`
`561`	`561`	`*(p_en--) = cor;`