Commit 66c435e2 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1177_ref_Resolve_IGF_Stereo_TCX' into 'float-pc' 

[non-BE][split-non-BE]patched MR1276 into float-pc.

See merge request !968
parents fe513ca6 b106569d

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ 
#define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO            /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */



#define NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS /* DLB: adjust prerendering and mixing gain in OSBA encoder. This is fix to float codes*/



#define NONBE_1211_DTX_BR_SWITCHING                     /* VA: port float issue 1211: fix crash in MASA DTX bitrate switching */

#define NONBE_FIX_1189_GSC_IVAS_OMASA                   /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */
@@ -209,6 +208,7 @@ 
#define NONBE_FIX_869_MASA_PREREND_MERGE                      /* Nokia: issue: #869: MASA pre-rend not updating energy */

#define FIX_910_REMOVE_DUPLICATION_TD_REND              /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */

#define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */

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



/* #################### End BASOP porting 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;

                }