Commit df7d10dc authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2446-harmonize-functions-con_tcx_fx-and-con_tcx_ivas_fx' into 'main' 

[Non-BE] [allow-regression] [split-non-BE] issue: 2446 Harmonize con_tcx_*()

See merge request !2831
parents 4bdbd445 65e1af4b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
#define FIX_BASOP_2475_ASSERT_IN_MASA2_REND_TO_MONO     /* Nokia: basop issue 2475: Fix MASA2 to MONO rendering within IVAS_rend */

#define FIX_2346_DUPLICATED_IGF_FUNCTIONS               /* FhG: basop issue 2346: Review potentially duplicated IGF functions */



#define HARMONIZE_2446_CON_TCX_FX                       /* FhG: basop issue: 2446 harmonization of function con_tcx_fx() */

/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_com/prot_fx.h

+13 −0
Original line number Diff line number Diff line
@@ -8512,10 +8512,12 @@ void modify_lsf( 
    const Word16 reset_q  /* Q0 */

);



#ifndef HARMONIZE_2446_CON_TCX_FX

void con_tcx_fx(

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

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

);

#endif // !HARMONIZE_2446_CON_TCX_FX



/* o : damping factor Q14*/

Word16 Damping_fact_fx(
@@ -9030,6 +9032,7 @@ void decoder_tcx_post_ivas_fx( 
    Word16 bfi,

    Word16 MCT_flag );



#ifndef HARMONIZE_2446_CON_TCX_FX

void con_tcx_ivas_fx(

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

    Word16 synth[],         /* i/o:   synth[]                Q0 */
@@ -9038,6 +9041,16 @@ void con_tcx_ivas_fx( 
    const Word16 only_left, /* i  : TD-PLC only in left channel */

    const Word16 *A_cng     /* i  : CNG LP filter coefficients  */

);

#else

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  */

    Word16 *noise_seed,     /* i/o: noise seed for stereo       */

    const Word16 only_left, /* i  : TD-PLC only in left channel */

    const Word16 *A_cng     /* i  : CNG LP filter coefficients  */

);

#endif // !HARMONIZE_2446_CON_TCX_FX



void ivas_mdct_core_reconstruct_fx(

    CPE_DEC_HANDLE hCPE,                                /* i/o: CPE decoder structure               */

lib_dec/dec_LPD_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -570,7 +570,11 @@ void decoder_LPD_fx( 
        IF( bfi != 0 && ( st->last_core != ACELP_CORE ) )

        {

            /* PLC: [TCX: TD PLC] */

#ifndef HARMONIZE_2446_CON_TCX_FX

            con_tcx_fx( st, &synthFB[0] );

#else

            con_tcx_fx( st, &synthFB[0], -16384, NULL, 0, NULL );

#endif

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

            st->con_tcx = 1;

            move16();

lib_dec/er_dec_tcx_fx.c

+335 −8

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_mdct_core_dec_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -1305,17 +1305,29 @@ void ivas_mdct_core_reconstruct_fx( 
            /* PLC: [TCX: TD PLC] */

            IF( MCT_flag != 0 )

            {

#ifndef HARMONIZE_2446_CON_TCX_FX

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

#else

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

#endif // !HARMONIZE_2446_CON_TCX_FX

            }

            ELSE

            {

                IF( sts[1]->core != ACELP_CORE )

                {

#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_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 1, &st->hFdCngDec->hFdCngCom->A_cng[0] );

#endif // !HARMONIZE_2446_CON_TCX_FX

                }

                ELSE

                {

#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_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 0, &st->hFdCngDec->hFdCngCom->A_cng[0] );

#endif // !HARMONIZE_2446_CON_TCX_FX

                }

            }

            st->hHQ_core->Q_old_wtda = add( st->hHQ_core->Q_old_wtda, q_syn );