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

Commit 0683b664 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Andre Eisenbach
Browse files

Fix misc-macro-parentheses warnings in embdrv/sbc. 

When compiled with WITH_TIDY=1, clang-tidy warns about
missing parameters around macro parameters.

Bug: 28705665
Change-Id: I79d234b88e090137412936b80303d21f0c59b0ae
parent b67e1816

system/embdrv/sbc/decoder/include/oi_bitstream.h

+17 −17
Original line number Diff line number Diff line
@@ -83,36 +83,36 @@ do { \ 
    OI_ASSERT((bitPtr) < 16); \

    OI_ASSERT((bitPtr) >= 8); \

    \

    result = (value) << (bitPtr); \

    result >>= 32 - (bits); \

    (result) = (value) << (bitPtr); \

    (result) >>= 32 - (bits); \

    \

    bitPtr += (bits); \

    while (bitPtr >= 16) { \

        value = ((value) << 8) | *ptr++; \

        bitPtr -= 8; \

    (bitPtr) += (bits); \

    while ((bitPtr) >= 16) { \

        (value) = ((value) << 8) | *(ptr)++; \

        (bitPtr) -= 8; \

    } \

    OI_ASSERT((bits == 0) || (result < (1u << (bits)))); \

    OI_ASSERT(((bits) == 0) || ((result) < (1u << (bits)))); \

} while (0)





#define OI_BITSTREAM_WRITEUINT(ptr, value, bitPtr, datum, bits) \

do {\

    bitPtr -= bits;\

    value |= datum << bitPtr;\

    (bitPtr) -= (bits);\

    (value) |= (datum) << (bitPtr);\

    \

    while (bitPtr <= 16) {\

        bitPtr += 8;\

        *ptr++ = (OI_UINT8)(value >> 24);\

        value <<= 8;\

    while ((bitPtr) <= 16) {\

        (bitPtr) += 8;\

        *(ptr)++ = (OI_UINT8)((value) >> 24);\

        (value) <<= 8;\

    }\

} while (0)



#define OI_BITSTREAM_WRITEFLUSH(ptr, value, bitPtr) \

do {\

    while (bitPtr < 32) {\

        bitPtr += 8;\

        *ptr++ = (OI_UINT8)(value >> 24);\

        value <<= 8;\

    while ((bitPtr) < 32) {\

        (bitPtr) += 8;\

        *(ptr)++ = (OI_UINT8)((value) >> 24);\

        (value) <<= 8;\

    }\

} while (0)

system/embdrv/sbc/decoder/include/oi_codec_sbc.h

+2 −2
Original line number Diff line number Diff line
@@ -187,8 +187,8 @@ typedef struct { 
 * */

#define CODEC_DATA_WORDS(numChannels, numBuffers) \

    ((\

        (sizeof(OI_INT32) * SBC_MAX_BLOCKS * numChannels * SBC_MAX_BANDS) \

         + (sizeof(SBC_BUFFER_T) * SBC_MAX_CHANNELS * SBC_MAX_BANDS * numBuffers) \

        (sizeof(OI_INT32) * SBC_MAX_BLOCKS * (numChannels) * SBC_MAX_BANDS) \

         + (sizeof(SBC_BUFFER_T) * SBC_MAX_CHANNELS * SBC_MAX_BANDS * (numBuffers)) \

         + (sizeof (OI_UINT32) - 1) \

    ) / sizeof(OI_UINT32))

system/embdrv/sbc/decoder/include/oi_codec_sbc_private.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ typedef struct { 
#define VALID_INT32(x) (((x) >= OI_INT32_MIN) && ((x) <= OI_INT32_MAX))



#define DCTII_8_SHIFT_IN 0

#define DCTII_8_SHIFT_OUT 16-DCTII_8_SHIFT_IN

#define DCTII_8_SHIFT_OUT (16-DCTII_8_SHIFT_IN)



#define DCTII_8_SHIFT_0 (DCTII_8_SHIFT_OUT)

#define DCTII_8_SHIFT_1 (DCTII_8_SHIFT_OUT)

system/embdrv/sbc/decoder/include/oi_stddefs.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ typedef OI_UINT32 OI_UTF32; 
 */



#ifndef OI_ARRAYSIZE

#define OI_ARRAYSIZE(a) (sizeof(a)/sizeof(a[0]))

#define OI_ARRAYSIZE(a) (sizeof(a)/sizeof((a)[0]))

#endif



/**

system/embdrv/sbc/decoder/include/oi_time.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ typedef OI_UINT16 OI_INTERVAL; 
 * Macro to convert milliseconds to OI_INTERVAL time units (Rounded Up)

 */



#define OI_MSECONDS(n)   ((OI_INTERVAL) ((n + MSECS_PER_OI_INTERVAL - 1) / MSECS_PER_OI_INTERVAL))

#define OI_MSECONDS(n)   ((OI_INTERVAL) (((n) + MSECS_PER_OI_INTERVAL - 1) / MSECS_PER_OI_INTERVAL))



/**

 * Macro to convert minutes to OI_INTERVAL time units