Commit 67184afc authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2446 Testing if setting the flag only in EVS_MONO could cause IVAS non... 

issue: 2446 Testing if setting the flag only in EVS_MONO could cause IVAS non bit exact results, new switch was added previously.
parent fa2d069a

lib_dec/dec_LPD_fx.c

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

            con_tcx_fx( st, &synthFB[0] );

#else



#ifndef HARMONIZE_2446_CON_TCX_FX_NONBE

            con_tcx_ivas_fx(st, &synthFB[0], -16384, NULL, 0, NULL, (Word16)1);

#else

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

#endif // !HARMONIZE_2446_CON_TCX_FX_NONBE



            

#endif

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

            st->con_tcx = 1;

lib_dec/ivas_mdct_core_dec_fx.c

+19 −3
Original line number Diff line number Diff line
@@ -1300,7 +1300,14 @@ 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



#ifndef HARMONIZE_2446_CON_TCX_FX_NONBE

                con_tcx_ivas_fx(st, &synthFB_fx[0], -16384, NULL, 0, NULL, 0); //-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

#endif // !HARMONIZE_2446_CON_TCX_FX_NONBE



                

#endif // !HARMONIZE_2446_CON_TCX_FX

            }

            ELSE
@@ -1310,7 +1317,12 @@ 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

#ifndef HARMONIZE_2446_CON_TCX_FX_NONBE

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

#endif // !HARMONIZE_2446_CON_TCX_FX_NONBE

                    

#endif // !HARMONIZE_2446_CON_TCX_FX

                }

                ELSE
@@ -1318,7 +1330,11 @@ 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

#ifndef HARMONIZE_2446_CON_TCX_FX_NONBE

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

#endif // !HARMONIZE_2446_CON_TCX_FX_NONBE

#endif // !HARMONIZE_2446_CON_TCX_FX

                }

            }

lib_dec/ivas_tcx_core_dec_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -492,7 +492,13 @@ 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



#ifndef HARMONIZE_2446_CON_TCX_FX_NONBE

        con_tcx_ivas_fx(st, &synthFB_fx[0], -16384, NULL, 0, NULL, 1);

#else

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

#endif //!HARMONIZE_2446_CON_TCX_FX_NONBE

        

#endif // !HARMONIZE_2446_CON_TCX_FX

        test();

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