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

issue: 2446 changes regarding possible previous harmonization efforts

parent ac900052

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
#define HARM_FD_BWE                                     /* VA: harmonize core-coder FD BWE function duplications */

#define FIX_2411_Harmonize_TNSANALYSIS_DETECTTNSFILT    /* FhG: basop issue 2411: harmonize TNSAnalysis*_fx(), DetectTnsFilt*_fx()*/        

#define HARMONIZE_READ_DECODE_TNS                       /* FhG basop 2389: Harm between two pairs of functions. */



#define HARMONIZE_2446_CON_TCX_FX                       /* FhG: basop issue 2446 harmonization of functions con_tcx_fx() and con_tcx_ivas_fx()*/

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



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

lib_dec/ivas_tcx_core_dec_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -488,7 +488,13 @@ void stereo_tcx_core_dec_fx( 
        }



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

#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] , -1.f, NULL, 0, NULL );

#endif // !HARMONIZE_2446_CON_TCX_FX



        

        test();

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

        {