Commit 2a1b6c58 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2427 changing name of the function and adhering to minimal invasive commits

parent 80b9908d

lib_com/prot_fx.h

+0 −5
Original line number Diff line number Diff line
@@ -8474,13 +8474,8 @@ void highPassFiltering_fx( 
    const Word16 hp_filt[],   /* i:   Q15    high pass filter coefficients                       */

    const Word16 l_fir_fer ); /* i:        high pass filter length                               */



#ifndef HARMONIZE_2427_GETPLC

Word16 GetPLCModeDecision_fx(

    Decoder_State *st );

#else

Word16 GetPLCModeDecision_ivas_fx(

    Decoder_State *st );

#endif // !HARMONIZE_2427_GETPLC



void lpc_unquantize_fx(

    Decoder_State *st,

lib_dec/dec_LPD_fx.c

+0 −9
Original line number Diff line number Diff line
@@ -174,11 +174,7 @@ void decoder_LPD_fx( 
            move16();

            st->core_brate = st->last_core_brate;

            move16();

#ifndef HARMONIZE_2427_GETPLC

            st->core = GetPLCModeDecision_fx( st );

#else

            st->core = GetPLCModeDecision_ivas_fx( st );

#endif // !HARMONIZE_2427_GETPLC





            move16();
@@ -205,12 +201,7 @@ void decoder_LPD_fx( 
     * PLC: Decide which Concealment to use. Update pitch lags if needed */

    IF( bfi != 0 )

    {

#ifndef HARMONIZE_2427_GETPLC

        st->core = GetPLCModeDecision_fx( st );

#else

        st->core = GetPLCModeDecision_ivas_fx( st );

#endif // !HARMONIZE_2427_GETPLC





        move16();

    }

lib_dec/er_util_fx.c

+8 −14
Original line number Diff line number Diff line
@@ -365,7 +365,12 @@ void highPassFiltering_fx( 
 * PLC: [Common: mode decision]

 * PLC: Decide which Concealment to use. Update pitch lags if needed

 *----------------------------------------------------------------------------------*/



#ifndef HARMONIZE_2427_GETPLC

Word16 GetPLCModeDecision_ivas_fx(

#else

Word16 GetPLCModeDecision_fx(

#endif // !HARMONIZE_2427_GETPLC

    Decoder_State *st /* i/o:    decoder memory state pointer */

)

{
@@ -459,7 +464,7 @@ Word16 GetPLCModeDecision_ivas_fx( 
                    {

                        TonalMDCTConceal_Detect( st->hTonalMDCTConc, pitch, &numIndices, st->element_mode );

                    }

#endif // !1

#endif // !HARMONIZE_2427_GETPLC



                    test();

                    test();
@@ -585,20 +590,9 @@ Word16 GetPLCModeDecision_fx( 
                    {

                        pitch = L_add( st->old_fpitch, 0 ); /*Q16*/

                    }

#ifndef HARMONIZE_2427_GETPLC

                    TonalMDCTConceal_Detect( st->hTonalMDCTConc, pitch, &numIndices, st->element_mode );

#else

                    // IVAS version

                    IF( st->element_mode != 0 )

                    {

                        TonalMDCTConceal_Detect_ivas_fx( st->hTonalMDCTConc, pitch, &numIndices, st->hTcxCfg->psychParamsCurrent, st->element_mode );

                    }

                    ELSE

                    {



                    TonalMDCTConceal_Detect(st->hTonalMDCTConc, pitch, &numIndices, st->element_mode);

                    }



#endif // !HARMONIZE_2427_GETPLC

                    test();

                    test();

                    test();

lib_dec/ivas_mdct_core_dec_fx.c

+6 −2
Original line number Diff line number Diff line
@@ -838,8 +838,12 @@ void ivas_mdct_core_invQ_fx( 


            /* PLC: [Common: mode decision]

             * PLC: Decide which Concealment to use. Update pitch lags if needed */



#ifndef HARMONIZE_2427_GETPLC

        st->core = GetPLCModeDecision_ivas_fx(st);

#else

        st->core = GetPLCModeDecision_fx(st);

#endif // !HARMONIZE_2427_GETPLC

            

        }



        test();

lib_dec/ivas_tcx_core_dec_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -323,7 +323,12 @@ void stereo_tcx_core_dec_fx( 


        /* PLC: [Common: mode decision]

         * PLC: Decide which Concealment to use. Update pitch lags if needed */

#ifndef HARMONIZE_2427_GETPLC

    st->core = GetPLCModeDecision_ivas_fx(st); /* Q0 */

#else

    st->core = GetPLCModeDecision_fx(st); /* Q0 */

#endif // !HARMONIZE_2427_GETPLC

        

        move16();

    }