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

Commit f89b497d authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix misc-macro-parentheses warnings." 

am: 8a6d716a

* commit '8a6d716a':
  Fix misc-macro-parentheses warnings.

Change-Id: Iddb5cd15ea4c16438e10f588e19a91c63eff752c
parents 04005f24 8a6d716a

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define DRC_DEFAULT_MOBILE_DRC_CUT   127 /* maximum compression of dynamic range for mobile conf */

#define DRC_DEFAULT_MOBILE_DRC_CUT   127 /* maximum compression of dynamic range for mobile conf */

#define DRC_DEFAULT_MOBILE_DRC_BOOST 127 /* maximum compression of dynamic range for mobile conf */

#define DRC_DEFAULT_MOBILE_DRC_BOOST 127 /* maximum compression of dynamic range for mobile conf */

#define DRC_DEFAULT_MOBILE_DRC_HEAVY 1   /* switch for heavy compression for mobile conf */

#define DRC_DEFAULT_MOBILE_DRC_HEAVY 1   /* switch for heavy compression for mobile conf */

#define DRC_DEFAULT_MOBILE_ENC_LEVEL -1 /* encoder target level; -1 => the value is unknown, otherwise dB step value (e.g. 64 for -16 dB) */

#define DRC_DEFAULT_MOBILE_ENC_LEVEL (-1) /* encoder target level; -1 => the value is unknown, otherwise dB step value (e.g. 64 for -16 dB) */

#define MAX_CHANNEL_COUNT            8  /* maximum number of audio channels that can be decoded */

#define MAX_CHANNEL_COUNT            8  /* maximum number of audio channels that can be decoded */

// names of properties that can be used to override the default DRC settings

// names of properties that can be used to override the default DRC settings

#define PROP_DRC_OVERRIDE_REF_LEVEL  "aac_drc_reference_level"

#define PROP_DRC_OVERRIDE_REF_LEVEL  "aac_drc_reference_level"

media/libstagefright/codecs/aacenc/basic_op/oper_32b.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -234,10 +234,10 @@ Word16 iLog4(Word32 value) 
}

}





#define step(shift) \

#define step(shift) \

    if ((0x40000000l >> shift) + root <= value)       \

    if ((0x40000000l >> (shift)) + root <= value)       \

    {                                                 \

    {                                                 \

        value -= (0x40000000l >> shift) + root;       \

        value -= (0x40000000l >> (shift)) + root;       \

        root = (root >> 1) | (0x40000000l >> shift);  \

        root = (root >> 1) | (0x40000000l >> (shift));  \

    } else {                                          \

    } else {                                          \

        root = root >> 1;                             \

        root = root >> 1;                             \

    }

    }

media/libstagefright/codecs/aacenc/basic_op/typedefs.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -89,11 +89,11 @@ typedef unsigned __int64 UWord64; 
#endif

#endif





#ifndef min

#ifndef min

#define min(a,b) ( a < b ? a : b)

#define min(a,b) ( (a) < (b) ? (a) : (b))

#endif

#endif





#ifndef max

#ifndef max

#define max(a,b) ( a > b ? a : b)

#define max(a,b) ( (a) > (b) ? (a) : (b))

#endif

#endif





#ifdef ARM_INASM

#ifdef ARM_INASM

media/libstagefright/codecs/aacenc/inc/psy_const.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ enum 
#define TRANSFORM_OFFSET_LONG    0

#define TRANSFORM_OFFSET_LONG    0

#define TRANSFORM_OFFSET_SHORT   448

#define TRANSFORM_OFFSET_SHORT   448





#define LOG_NORM_PCM          -15

#define LOG_NORM_PCM          (-15)





#define NUM_SAMPLE_RATES	12

#define NUM_SAMPLE_RATES	12

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -23,10 +23,10 @@ 
#include "bit_cnt.h"

#include "bit_cnt.h"

#include "aac_rom.h"

#include "aac_rom.h"





#define HI_LTAB(a) (a>>8)

#define HI_LTAB(a) ((a)>>8)

#define LO_LTAB(a) (a & 0xff)

#define LO_LTAB(a) ((a) & 0xff)





#define EXPAND(a)  ((((Word32)(a&0xff00)) << 8)|(Word32)(a&0xff))

#define EXPAND(a)  ((((Word32)((a)&0xff00)) << 8)|(Word32)((a)&0xff))









/*****************************************************************************

/*****************************************************************************