diff options
| author | Martin Storsjo <martin@martin.st> | 2012-01-12 14:45:41 +0200 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-08 14:32:01 -0700 |
| commit | 93eb01fd39e31b7532932f60828abf11a494fb8f (patch) | |
| tree | 6011b5ee492209521ec470bab3c6521fef915dd1 /media/libstagefright/codecs/aacenc | |
| parent | 281a5040c92ff652d890b66e3ed9c081da39ee15 (diff) | |
| download | frameworks_av-93eb01fd39e31b7532932f60828abf11a494fb8f.zip frameworks_av-93eb01fd39e31b7532932f60828abf11a494fb8f.tar.gz frameworks_av-93eb01fd39e31b7532932f60828abf11a494fb8f.tar.bz2 | |
stagefright aacenc: Add parentheses in expression with mixed && and ||
This doesn't maintain the exact behaviour, but seems closer to
what the original author probably intended.
This avoids a warning.
Change-Id: I191292faa0a25f715f2b7d46ec770827e2ac0b7b
Diffstat (limited to 'media/libstagefright/codecs/aacenc')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/aacenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/aacenc.c b/media/libstagefright/codecs/aacenc/src/aacenc.c index ad2f29a..d1c8621 100644 --- a/media/libstagefright/codecs/aacenc/src/aacenc.c +++ b/media/libstagefright/codecs/aacenc/src/aacenc.c @@ -357,9 +357,9 @@ VO_U32 VO_API voAACEncSetParam(VO_HANDLE hCodec, VO_S32 uParamID, VO_PTR pData) if(config.sampleRate%8000 == 0) tmp =480; /* check the bitrate */ - if(config.bitRate!=0 && (config.bitRate/config.nChannelsOut < 4000) || + if(config.bitRate!=0 && ((config.bitRate/config.nChannelsOut < 4000) || (config.bitRate/config.nChannelsOut > 160000) || - (config.bitRate > config.sampleRate*6*config.nChannelsOut)) + (config.bitRate > config.sampleRate*6*config.nChannelsOut))) { config.bitRate = 640*config.sampleRate/tmp*config.nChannelsOut; |