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

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

Merge "Fix more tidy error" am: 577933fa 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2294298



Change-Id: Ibb51363631f602093609555c7f16a4064ede1056
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47cd2678 577933fa

system/embdrv/encoder_for_aptx/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ tidy_errors = [ 
    "-cppcoreguidelines-init-variables",

    "-cppcoreguidelines-narrowing-conversions",

    "-hicpp-signed-bitwise",

    "-llvm-header-guard",

    "-readability-avoid-const-params-in-decls",

    "-readability-identifier-length",

    "-readability-magic-numbers",

]

system/embdrv/encoder_for_aptx/src/AptxEncoder.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "SubbandFunctionsCommon.h"



/* Function to carry out a single-channel aptX encode on 4 new PCM samples */

XBT_INLINE_ void aptxEncode(int32_t pcm[4], Qmf_storage* Qmf_St,

XBT_INLINE_ void aptxEncode(const int32_t pcm[4], Qmf_storage* Qmf_St,

                            Encoder_data* EncoderDataPt) {

  int32_t predVals[4];

  int32_t qCodes[4];

system/embdrv/encoder_for_aptx/src/AptxParameters.h

+6 −2
Original line number Diff line number Diff line
@@ -45,8 +45,12 @@ 


/* Signed saturate to a 24bit value */

XBT_INLINE_ int32_t ssat24(int32_t val) {

  if (val > 8388607) val = 8388607;

  if (val < -8388608) val = -8388608;

  if (val > 8388607) {

    val = 8388607;

  }

  if (val < -8388608) {

    val = -8388608;

  }

  return val;

}

system/embdrv/encoder_for_aptx/src/DitherGenerator.h

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
/* This function updates an internal bit-pool (private

 * variable in DitherGenerator) based on bits obtained from

 * previously encoded or received aptX codewords. */

XBT_INLINE_ int32_t xbtEncupdateCodewordHistory(int32_t quantisedCodes[4],

XBT_INLINE_ int32_t xbtEncupdateCodewordHistory(const int32_t quantisedCodes[4],

                                                int32_t m_codewordHistory) {

  int32_t newBits;

  int32_t updatedCodewordHistory;
@@ -62,7 +62,8 @@ XBT_INLINE_ int32_t xbtEncupdateCodewordHistory(int32_t quantisedCodes[4], 
XBT_INLINE_ int32_t xbtEncgenerateDither(int32_t m_codewordHistory,

                                         int32_t* m_ditherOutputs) {

  int32_t history24b;

  int32_t upperAcc, lowerAcc;

  int32_t upperAcc;

  int32_t lowerAcc;

  int32_t accSum;

  int64_t tmp_acc;

  int32_t ditherSample;

system/embdrv/encoder_for_aptx/src/Qmf.h

+3 −2
Original line number Diff line number Diff line
@@ -77,8 +77,9 @@ void AsmQmfConvI(const int32_t* p1dl_buffPtr, const int32_t* p2dl_buffPtr, 
void AsmQmfConvO(const int16_t* p1dl_buffPtr, const int16_t* p2dl_buffPtr,

                 const int32_t* coeffPtr, int32_t* convSumDiff);



XBT_INLINE_ void QmfAnalysisFilter(int32_t pcm[4], Qmf_storage* Qmf_St,

                                   int32_t* predVals, int32_t* aqmfOutputs) {

XBT_INLINE_ void QmfAnalysisFilter(const int32_t pcm[4], Qmf_storage* Qmf_St,

                                   const int32_t predVals[4],

                                   int32_t* aqmfOutputs) {

  int32_t convSumDiff[4];

  int32_t filterOutputs[4];