Commit 8ba1d79d authored by bayers's avatar bayers
Browse files

Merge branch '931-igf-stereo-tcx-noise-filling-substitution-done-on-the-wrong-spectra' into 'main' 

[Non-BE][split-non-be] Resolve "IGF Stereo TCX noise filling substitution done on the wrong spectra"

See merge request !1276
parents 57c2eb0d 97fc2155

lib_com/options.h

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR               /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */

#define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING                 /* Dlb: issue 907: fix for band mapping at VLBR */

#define NONBE_FIX_869_MASA_PREREND_MERGE                      /* Nokia: issue: #869: MASA pre-rend not updating energy */

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



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

lib_dec/igf_dec.c

+16 −0
Original line number Diff line number Diff line
@@ -490,7 +490,11 @@ 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;

            }
@@ -507,7 +511,11 @@ 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;

            }
@@ -574,7 +582,11 @@ 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;

                }
@@ -591,7 +603,11 @@ 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;

                }