Commit 6f6a6537 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2427 Further harmonizing uses of the function getplcmodedecision

parent 347a0a62

lib_dec/dec_LPD_fx.c

+15 −3
Original line number Diff line number Diff line
@@ -174,7 +174,13 @@ 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();

        }

    }
@@ -199,7 +205,13 @@ 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

+11 −3
Original line number Diff line number Diff line
@@ -448,8 +448,16 @@ Word16 GetPLCModeDecision_ivas_fx( 
                    {

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

                    }



#ifndef HARMONIZE_2427_GETPLC

                    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);

#else

                    IF(st->element_mode != 0) {

                        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);

                    }

                    ELSE{

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

                    }

#endif // !1

             

                    test();

                    test();