Commit fe30c9be authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2480 Changing function name in definition declaration and instance

parent 1f2a2a63

lib_com/ivas_prot_fx.h

+10 −1
Original line number Diff line number Diff line
@@ -1681,6 +1681,7 @@ void ivas_mdct_tcx10_bit_distribution_fx( 
    const Word16 nTnsBitsTCX10[NB_DIV]                          /* i  : TNS bits                                */

);



#ifndef FIX_2480_HARM_TONALMDCT

void TonalMDCTConceal_Detect_ivas_fx(

    const TonalMDCTConcealPtr hTonalMDCTConc,

    const Word32 pitchLag,
@@ -1688,7 +1689,15 @@ void TonalMDCTConceal_Detect_ivas_fx( 
    const PsychoacousticParameters *psychParamsCurrent,

    Word16 element_mode 

);



#else

void TonalMDCTConceal_Detect_fx(

    const TonalMDCTConcealPtr hTonalMDCTConc,

    const Word32 pitchLag,

    Word16* numIndices,

    const PsychoacousticParameters* psychParamsCurrent,

    Word16 element_mode

);

#endif // !FIX_2480_HARM_TONALMDCT

ivas_error stereo_dft_dec_create_fx(

    STEREO_DFT_DEC_DATA_HANDLE *hStereoDft,                     /* i/o: decoder DFT stereo handle               */

    const Word32 element_brate,                                 /* i  : element bitrate                         */

lib_dec/er_util_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ Word16 GetPLCModeDecision_fx( 
                        TonalMDCTConceal_Detect_fx(st->hTonalMDCTConc, pitch, &numIndices, st->element_mode);

                    }

#else

                    TonalMDCTConceal_Detect_ivas_fx(st->hTonalMDCTConc, pitch, &numIndices, (EQ_16(st->element_mode, IVAS_CPE_MDCT) ? &(st->hTcxCfg->psychParamsTCX20) : st->hTcxCfg->psychParamsCurrent), st->element_mode);

                    TonalMDCTConceal_Detect_fx(st->hTonalMDCTConc, pitch, &numIndices, (EQ_16(st->element_mode, IVAS_CPE_MDCT) ? &(st->hTcxCfg->psychParamsTCX20) : st->hTcxCfg->psychParamsCurrent), st->element_mode);

#endif // !FIX_2480_HARM_TONALMDCT

lib_dec/tonalMDCTconcealment_fx.c

+11 −3
Original line number Diff line number Diff line
@@ -1054,13 +1054,21 @@ void TonalMDCTConceal_Detect_fx( 
    return;

}

#endif // !FIX_2480_HARM_TONALMDCT



#ifndef FIX_2480_HARM_TONALMDCT

void TonalMDCTConceal_Detect_ivas_fx(

    const TonalMDCTConcealPtr hTonalMDCTConc,

    const Word32 pitchLag, /*15Q16*/

    Word16* numIndices,

    const PsychoacousticParameters* psychParamsCurrent,

    Word16 element_mode )

#else

void TonalMDCTConceal_Detect_fx(

    const TonalMDCTConcealPtr hTonalMDCTConc,

    const Word32 pitchLag, /*15Q16*/

    Word16* numIndices,

    const PsychoacousticParameters* psychParamsCurrent,

    Word16 element_mode)

#endif // !FIX_2480_HARM_TONALMDCT

{

    Word32 secondLastMDST[L_FRAME_MAX];