Commit e5cccd2b authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2446 Removing the NONBE switch since the experiment is concluded,... 

issue: 2446 Removing the NONBE switch since the experiment is concluded, removing the switch definition, replacing flag with element mode equality to EVS_MONO
parent 5a505915

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ 
#define FIX_2467_RENAME_GSC_FUNCTION                    /* VA: basop issue 2467: Removal of unused function/table and renaming of _ivas_fx versions to default ones. */



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

#define HARMONIZE_2446_CON_TCX_FX_NONBE                 /* FhG: experimental switch for BE analysis of basop issue 2446 */

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



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

lib_dec/dec_LPD_fx.c

+1 −8
Original line number Diff line number Diff line
@@ -573,14 +573,7 @@ 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, 1 );

#else

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

#endif // !HARMONIZE_2446_CON_TCX_FX_NONBE





            con_tcx_ivas_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/ivas_mdct_core_dec_fx.c

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



#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, (Word16) EQ_16( st->element_mode, EVS_MONO ) ); //-1.Q14 = -16384

#endif // !HARMONIZE_2446_CON_TCX_FX_NONBE





                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

            }

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

#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], (Word16) EQ_16( st->element_mode, EVS_MONO ) );

#endif // !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], EQ_16( st->element_mode, EVS_MONO));

#endif // !HARMONIZE_2446_CON_TCX_FX

                }

                ELSE
@@ -1330,11 +1318,8 @@ 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], (Word16) EQ_16( st->element_mode, EVS_MONO ) );

#endif // !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], EQ_16(st->element_mode, EVS_MONO));



#endif // !HARMONIZE_2446_CON_TCX_FX

                }

            }

lib_dec/ivas_tcx_core_dec_fx.c

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



#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, (Word16) EQ_16( st->element_mode, EVS_MONO ) );

#endif //! HARMONIZE_2446_CON_TCX_FX_NONBE



        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

        test();

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