Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"

Jean-Baptiste Queru · android code review · commit 6a300a541389 · 2012-02-24T10:28:01.000-08:00
diff --git a/media/libstagefright/codecs/aacenc/inc/bitbuffer.h b/media/libstagefright/codecs/aacenc/inc/bitbuffer.h
@@ -76,7 +76,7 @@ Word16 GetBitsAvail(HANDLE_BIT_BUF hBitBuf);
 
 
 Word16 WriteBits(HANDLE_BIT_BUF hBitBuf,
-                 Word32 writeValue,
+                 UWord32 writeValue,
                  Word16 noBitsToWrite);
 
 void ResetBitBuf(HANDLE_BIT_BUF hBitBuf,
diff --git a/media/libstagefright/codecs/aacenc/src/bitbuffer.c b/media/libstagefright/codecs/aacenc/src/bitbuffer.c
@@ -138,7 +138,7 @@ Word16 GetBitsAvail(HANDLE_BIT_BUF hBitBuf)
 *
 *****************************************************************************/
 Word16 WriteBits(HANDLE_BIT_BUF hBitBuf,
-                 Word32 writeValue,
+                 UWord32 writeValue,
                  Word16 noBitsToWrite)
 {
   Word16 wBitPos;

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ Word16 GetBitsAvail(HANDLE_BIT_BUF hBitBuf)`
`138`	`138`	`*`
`139`	`139`	`*****************************************************************************/`
`140`	`140`	`Word16 WriteBits(HANDLE_BIT_BUF hBitBuf,`
`141`		`- Word32 writeValue,`
	`141`	`+ UWord32 writeValue,`
`142`	`142`	`Word16 noBitsToWrite)`
`143`	`143`	`{`
`144`	`144`	`Word16 wBitPos;`