Commit 44001e20 authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_931_IGF_STEREO_DEC_NOISE

parent 97846176

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_931_IGF_STEREO_DEC_NOISE	                  /* FhG: issue #931: fix noise substitution in the stereo IGF decoder      */

#define NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW           /* FhG: issue 943: fix crash in BW switchin from WB in MDCT-Stereo core encoder */



/* ##################### End NON-BE switches ########################### */

lib_dec/igf_dec.c

+0 −16
Original line number Diff line number Diff line
@@ -490,11 +490,7 @@ static void IGF_prepStereo( 
            {

                if ( hPrivateDataL->n_noise_bands_off )

                {

#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE

                    IGF_replaceTCXNoise_2_new( src_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );

#else

                    IGF_replaceTCXNoise_2_new( igf_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );

#endif

                }

                sel_specL = src_specL;

            }
@@ -511,11 +507,7 @@ static void IGF_prepStereo( 
            {

                if ( hPrivateDataR->n_noise_bands_off )

                {

#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE

                    IGF_replaceTCXNoise_2_new( src_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );

#else

                    IGF_replaceTCXNoise_2_new( igf_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );

#endif

                }

                sel_specR = src_specR;

            }
@@ -582,11 +574,7 @@ static void IGF_prepStereo( 
                {

                    if ( hPrivateDataL->n_noise_bands_off )

                    {

#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE

                        IGF_replaceTCXNoise_2_new( src_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );

#else

                        IGF_replaceTCXNoise_2_new( igf_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );

#endif

                    }

                    sel_specL = src_specL;

                }
@@ -603,11 +591,7 @@ static void IGF_prepStereo( 
                {

                    if ( hPrivateDataR->n_noise_bands_off )

                    {

#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE

                        IGF_replaceTCXNoise_2_new( src_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );

#else

                        IGF_replaceTCXNoise_2_new( igf_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );

#endif

                    }

                    sel_specR = src_specR;

                }