Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce4de8d1 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"

parents 60b3d59d f4e7ff9e

media/libstagefright/codecs/aacenc/src/aacenc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;