diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-08 14:10:10 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-08 14:10:11 -0700 |
| commit | ce4de8d141386ade1f184aa1b56fff7d3097dc3f (patch) | |
| tree | 23ece47036524e706fbe9ee8cfde8483072784b9 | |
| parent | 60b3d59d7f788046a45a5fd4e97ec7235fb55787 (diff) | |
| parent | f4e7ff9e5a0da6552d73fc7ce0c712c45fc2dd2d (diff) | |
| download | base-ce4de8d141386ade1f184aa1b56fff7d3097dc3f.tar.gz | |
Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"
| -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 ad2f29a55a1f..d1c862116c1b 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; |