Commit 9fb5d4d1 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2446 Renaming function instances, definition and declaration as final efforts of harmonizing

parent f9a50ca8

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -9009,7 +9009,7 @@ void con_tcx_ivas_fx( 
    const Word16 *A_cng     /* i  : CNG LP filter coefficients  */

);

#else

void con_tcx_ivas_fx(

void con_tcx_fx(

    Decoder_State *st,      /* i/o: coder memory state          */

    Word16 synth[],         /* i/o:   synth[]                Q0 */

    const Word16 coh,       /* i  : coherence of stereo signal  */

lib_dec/dec_LPD_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ void decoder_LPD_fx( 
#ifndef HARMONIZE_2446_CON_TCX_FX

            con_tcx_fx( st, &synthFB[0] );

#else

            con_tcx_ivas_fx(st, &synthFB[0], -16384, NULL, 0, NULL, EQ_16(st->element_mode, EVS_MONO));

            con_tcx_fx(st, &synthFB[0], -16384, NULL, 0, NULL, EQ_16(st->element_mode, EVS_MONO));

#endif

            lerp( synthFB, synth, st->L_frame, hTcxDec->L_frameTCX );

            st->con_tcx = 1;

lib_dec/er_dec_tcx_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ void con_tcx_fx( 
#endif // !HARMONIZE_2446_CON_TCX_FX



#ifdef HARMONIZE_2446_CON_TCX_FX

void con_tcx_ivas_fx(

void con_tcx_fx(

    Decoder_State *st,      /* i/o: coder memory state             */

    Word16 synth[],         /* i/o:   synth[]                   Q0 */

    const Word16 coh,       /* i  : coherence of stereo signal  Q14*/

lib_dec/ivas_mdct_core_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ void ivas_mdct_core_reconstruct_fx( 
#ifndef HARMONIZE_2446_CON_TCX_FX

                con_tcx_ivas_fx( st, &synthFB_fx[0], -16384, NULL, 0, NULL ); //-1.Q14 = -16384

#else

                con_tcx_ivas_fx( st, &synthFB_fx[0], -16384, NULL, 0, NULL, EQ_16( st->element_mode, EVS_MONO )); //-1.Q14 = -16384

                con_tcx_fx( st, &synthFB_fx[0], -16384, NULL, 0, NULL, EQ_16( st->element_mode, EVS_MONO )); //-1.Q14 = -16384

#endif // !HARMONIZE_2446_CON_TCX_FX

            }

            ELSE
@@ -1310,7 +1310,7 @@ void ivas_mdct_core_reconstruct_fx( 
#ifndef HARMONIZE_2446_CON_TCX_FX

                    con_tcx_ivas_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 1, &st->hFdCngDec->hFdCngCom->A_cng[0] );

#else

                    con_tcx_ivas_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 1, &st->hFdCngDec->hFdCngCom->A_cng[0], EQ_16( st->element_mode, EVS_MONO));

                    con_tcx_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 1, &st->hFdCngDec->hFdCngCom->A_cng[0], EQ_16( st->element_mode, EVS_MONO));

#endif // !HARMONIZE_2446_CON_TCX_FX

                }

                ELSE
@@ -1318,7 +1318,7 @@ void ivas_mdct_core_reconstruct_fx( 
#ifndef HARMONIZE_2446_CON_TCX_FX

                    con_tcx_ivas_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 0, &st->hFdCngDec->hFdCngCom->A_cng[0] );

#else

                    con_tcx_ivas_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 0, &st->hFdCngDec->hFdCngCom->A_cng[0], EQ_16(st->element_mode, EVS_MONO));

                    con_tcx_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 0, &st->hFdCngDec->hFdCngCom->A_cng[0], EQ_16(st->element_mode, EVS_MONO));

#endif // !HARMONIZE_2446_CON_TCX_FX

                }

            }

lib_dec/ivas_tcx_core_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ void stereo_tcx_core_dec_fx( 
#ifndef HARMONIZE_2446_CON_TCX_FX

        con_tcx_fx( st, &synthFB_fx[0] /*, -1.f, NULL, 0, NULL */ );

#else

        con_tcx_ivas_fx(st, &synthFB_fx[0], -16384, NULL, 0, NULL, EQ_16(st->element_mode, EVS_MONO));

        con_tcx_fx(st, &synthFB_fx[0], -16384, NULL, 0, NULL, EQ_16(st->element_mode, EVS_MONO));

#endif // !HARMONIZE_2446_CON_TCX_FX

        test();

        IF( ( EQ_16( st->nbLostCmpt, 1 ) ) || hTcxDec->tcxConceal_recalc_exc )