Commit 216bf478 authored by Arthur Tritthart's avatar Arthur Tritthart
Browse files

fix clang-format issue

parent eb836cef

lib_dec/TonalComponentDetection_fx.c

100755 → 100644
+77 −71
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static void GetF0( Word16 const nSamples, Word16 const nSamplesCore, Word32 cons 
#endif

                   Word16 *const pF0

#ifdef FIX_ISSUE_1966

    , Word32 *const pF0_32

                   ,

                   Word32 *const pF0_32

#endif

);

static void findStrongestHarmonics( const Word16 nSamples, const Word32 *powerSpectrum, const Word16 F0, const Word16 nTotalHarmonics, Word16 *pHarmonicIndexes, Word16 *pnHarmonics );
@@ -49,8 +50,7 @@ static void CorrectF0( const Word16 *pHarmonicIndexes, const Word16 nHarmonics, 
static void CorrectF0( const Word16 *pHarmonicIndexes, const Word16 nHarmonics, Word16 *pF0 );

#endif

#ifdef FIX_ISSUE_1966

static void findCandidates( const Word16 nSamples, const Word32 *MDCTSpectrum, const Word16 MDCTSpectrum_exp, 

                                  Word16 *thresholdModificationNew, Word32 *thresholdModificationNew32, Word16 floorPowerSpectrum );

static void findCandidates( const Word16 nSamples, const Word32 *MDCTSpectrum, const Word16 MDCTSpectrum_exp, Word16 *thresholdModificationNew, Word32 *thresholdModificationNew32, Word16 floorPowerSpectrum );

#else

static void findCandidates( const Word16 nSamples, const Word32 *MDCTSpectrum, const Word16 MDCTSpectrum_exp, Word16 *thresholdModificationNew, Word16 floorPowerSpectrum );

#endif
@@ -83,21 +83,20 @@ static void modifyThresholds( Word16 F0, 
#endif

);

#ifdef FIX_ISSUE_1966

static void RefineThresholdsUsingPitch_fx( const Word16 nSamples, const Word16 nSamplesCore, const Word32 powerSpectrum[], const Word32 lastPitchLag, const Word32 currentPitchLag, 

                                           Word16 *pF0, Word32 *pF0_32, Word16 *thresholdModification, Word32 *thresholdModification32 );

static void RefineThresholdsUsingPitch_fx( const Word16 nSamples, const Word16 nSamplesCore, const Word32 powerSpectrum[], const Word32 lastPitchLag, const Word32 currentPitchLag, Word16 *pF0, Word32 *pF0_32, Word16 *thresholdModification, Word32 *thresholdModification32 );

#else

static void RefineThresholdsUsingPitch_fx( const Word16 nSamples, const Word16 nSamplesCore, const Word32 powerSpectrum[], const Word32 lastPitchLag, const Word32 currentPitchLag, Word16 *pF0, Word16 *thresholdModification );

#endif



#ifdef FIX_ISSUE_1966

static void findTonalComponents_fx( Word16 *indexOfTonalPeak, Word16 *lowerIndex, Word16 *upperIndex, Word16 *numIndexes, Word16 nSamples, const Word32 *powerSpectrum, const Word16 powerSpectrum_e, 

            Word16 F0, Word32 F0_32, Word16 *thresholdModification, Word32 *thresholdModification32, Word16 element_mode );

static void findTonalComponents_fx( Word16 *indexOfTonalPeak, Word16 *lowerIndex, Word16 *upperIndex, Word16 *numIndexes, Word16 nSamples, const Word32 *powerSpectrum, const Word16 powerSpectrum_e, Word16 F0, Word32 F0_32, Word16 *thresholdModification, Word32 *thresholdModification32, Word16 element_mode );

#else

static void findTonalComponents_fx( Word16 *indexOfTonalPeak, Word16 *lowerIndex, Word16 *upperIndex, Word16 *numIndexes, Word16 nSamples, const Word32 *powerSpectrum, const Word16 powerSpectrum_e, Word16 F0, Word16 *thresholdModification, Word16 element_mode );

#endif



#ifdef FIX_ISSUE_1966

static inline int32_t double_to_q31_with_exp(double x, int *out_exp) {

static inline int32_t double_to_q31_with_exp( double x, int *out_exp )

{

    // Zerlege x in Mantisse und Exponent: x = m * 2^e, m in [0.5, 1) oder (-1, -0.5]

    int e;

    double m = frexp( x, &e ); // x = m * 2^e, mit |m| in (0.5, 1]
@@ -119,17 +118,21 @@ static inline int32_t double_to_q31_with_exp(double x, int *out_exp) { 
        scaled -= 0.5;



    // Saturation in int32_t

    if (scaled > (double)INT32_MAX) scaled = (double)INT32_MAX;

    if (scaled < (double)INT32_MIN) scaled = (double)INT32_MIN;

    if ( scaled > (double) INT32_MAX )

        scaled = (double) INT32_MAX;

    if ( scaled < (double) INT32_MIN )

        scaled = (double) INT32_MIN;



    int32_t m_q31 = (int32_t) scaled;



    if (out_exp) *out_exp = e;

    if ( out_exp )

        *out_exp = e;



    return m_q31;

}

// Optionaler Helper: Mantisse aus Q31 zurück zu double (nur zur Überprüfung)

static inline double q31_to_double(int32_t q31) {

static inline double q31_to_double( int32_t q31 )

{

    // q31 → double in [-1, 1)

    return ( (double) q31 ) / (double) ( 1ULL << 31 );

}
@@ -529,7 +532,8 @@ static void GetF0( 
#endif

    Word16 /*short*/ *const pF0 /*o   -  Q10*/

#ifdef FIX_ISSUE_1966

    , Word32 *const pF0_32

    ,

    Word32 *const pF0_32

#endif

)

{
@@ -1410,7 +1414,8 @@ static void RefineThresholdsUsingPitch_fx( 
#endif

    Word16 *thresholdModification /*Q10*/

#ifdef FIX_ISSUE_1966

  , Word32 *thresholdModification32 /*Q10+Q16*/

    ,

    Word32 *thresholdModification32 /*Q10+Q16*/

#endif

)

{
@@ -1439,7 +1444,8 @@ static void RefineThresholdsUsingPitch_fx( 
#endif

               pF0

#ifdef FIX_ISSUE_1966

                                                                    ,pF0_32

               ,

               pF0_32

#endif

        );

lib_dec/ivas_mdct_core_dec_fx.c

+2 −3
Original line number Diff line number Diff line
@@ -1604,7 +1604,6 @@ void ivas_mdct_core_tns_ns_fx( 
#ifdef DEBUG_ISSUE_1966

                printf( "->ch=%d tonal_mdct_plc_active=%d  F2\n", ch, st->tonal_mdct_plc_active );

#endif



            }



            /* nothing to do for missing LFE */

lib_dec/er_util_fx.c

+3 −3

File changed.

Contains only whitespace changes.

lib_dec/tonalMDCTconcealment_fx.c

+10 −10

File changed.

Contains only whitespace changes.