summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2010-12-22 22:39:18 +0100
committerMartin Storsjo <martin@martin.st>2012-01-13 20:57:27 +0200
commit2f0fb8c1ec139d385feb6990111ed6dc93422eac (patch)
tree8ff81b9f910255bd14270f784a67c8b85a63377e /media
parentb676a05348e4c516fa8b57e33b10548e6142c3f8 (diff)
downloadframeworks_av-2f0fb8c1ec139d385feb6990111ed6dc93422eac.zip
frameworks_av-2f0fb8c1ec139d385feb6990111ed6dc93422eac.tar.gz
frameworks_av-2f0fb8c1ec139d385feb6990111ed6dc93422eac.tar.bz2
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Currently, a pointer to a Word32 is used as a pointer to Word16, which doesn't work as intended on big endian architectures. This change needs to be analyzed and tested properly so that it doesn't cause issues with overflows in these variables. Another solution would be to change all the scf arrays to 32 bit instead. Change-Id: I53d9eb83bdaf8d3b1530eb5064dd10b08bce737a
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/codecs/aacenc/src/sf_estim.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/sf_estim.c b/media/libstagefright/codecs/aacenc/src/sf_estim.c
index fe40137..bc320ec 100644
--- a/media/libstagefright/codecs/aacenc/src/sf_estim.c
+++ b/media/libstagefright/codecs/aacenc/src/sf_estim.c
@@ -400,7 +400,7 @@ static void assimilateSingleScf(PSY_OUT_CHANNEL *psyOutChan,
Word16 *minScfCalculated,
Flag restartOnSuccess)
{
- Word32 sfbLast, sfbAct, sfbNext, scfAct, scfMin;
+ Word16 sfbLast, sfbAct, sfbNext, scfAct, scfMin;
Word16 *scfLast, *scfNext;
Word32 sfbPeOld, sfbPeNew;
Word32 sfbDistNew;