From f4e7ff9e5a0da6552d73fc7ce0c712c45fc2dd2d Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Thu, 12 Jan 2012 14:45:41 +0200 Subject: [PATCH] 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 --- media/libstagefright/codecs/aacenc/src/aacenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/libstagefright/codecs/aacenc/src/aacenc.c b/media/libstagefright/codecs/aacenc/src/aacenc.c index ad2f29a55a1f2..d1c862116c1b4 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;