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

Commit 961f938d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "A2DP: Fix integer sanitizer in SBC encoder" am: 9787c3f1 

Change-Id: If0f70548618cdc37aa20afea9c8b34bbf52380f5
parents 657954d9 9787c3f1

system/embdrv/sbc/encoder/srce/sbc_packing.c

+12 −13
Original line number Diff line number Diff line
@@ -41,13 +41,9 @@ 
  s32OutLow = (int32_t)(s32In1) * (int32_t)(s32In2);

#define Mult64(s32In1, s32In2, s32OutLow, s32OutHi)                \

  {                                                                \

    (s32OutLow) = ((int32_t)(uint16_t)(s32In1) * (uint16_t)(s32In2)); \

    s32TempVal2 = (int32_t)(((s32In1) >> 16) * (uint16_t)(s32In2));   \

    s32Carry = ((((uint32_t)(s32OutLow) >> 16) & 0xFFFF) +            \

                +(s32TempVal2 & 0xFFFF)) >>                           \

               16;                                                    \

    (s32OutLow) += (s32TempVal2 << 16);                               \

    (s32OutHi) = (s32TempVal2 >> 16) + s32Carry;                      \

    __builtin_mul_overflow(s32In1, (uint16_t)s32In2, &s64OutTemp); \

    s32OutLow = s64OutTemp & 0xFFFFFFFF;                           \

    s32OutHi = (s64OutTemp >> 32) & 0xFFFFFFFF;                    \

  }

#endif
@@ -77,7 +73,10 @@ uint32_t EncPacking(SBC_ENC_PARAMS* pstrEncParams, uint8_t* output) { 
  int32_t s32Temp1;   /*used in 64-bit multiplication*/

  int32_t s32Low;     /*used in 64-bit multiplication*/

#if (SBC_IS_64_MULT_IN_QUANTIZER == TRUE)

  int32_t s32Hi1, s32Low1, s32Carry, s32TempVal2, s32Hi, s32Temp2;

  int32_t s32Hi1, s32Low1, s32Hi, s32Temp2;

#if (SBC_ARM_ASM_OPT != TRUE)

  int64_t s64OutTemp;

#endif

#endif



  pu8PacketPtr = output;           /*Initialize the ptr*/
@@ -141,7 +140,7 @@ uint32_t EncPacking(SBC_ENC_PARAMS* pstrEncParams, uint8_t* output) { 
        u16Levels = (uint16_t)(((uint32_t)1 << s32LoopCount) - 1);



        /* quantizer */

        s32Temp1 = (*ps32SbPtr >> 2) + (u32SfRaisedToPow2 << 12);

        s32Temp1 = (*ps32SbPtr >> 2) + (int32_t)(u32SfRaisedToPow2 << 12);

        s32Temp2 = u16Levels;



        Mult64(s32Temp1, s32Temp2, s32Low, s32Hi);