Commit 7d038af7 authored by reutelhuber's avatar reutelhuber
Browse files

Merge branch '547-possible-nan-in-ivas-igf-decoder' into 'main' 

Resolve "Possible nan in IVAS IGF decoder"

See merge request !741
parents 8ef87da1 efa1cecd

lib_com/options.h

100644 → 100755
+3 −0
Original line number Diff line number Diff line
@@ -181,10 +181,13 @@ 
#define MASA_PREREND                                    /* Nokia: Contribution 42: Support for IVAS_rend to merge MASA + other format to MASA */

#define FIX_383_CLEAN_UP                                /* Dlb : Clean up of unused functions */

#define ISM_25k6_HZ_CORE                                /* VA: issue 540: 1ISM 48 kbps - change ACELP/TCX 16 kHz core to TCX only 25.6 kHz core */



#define FIX_528_ISM_MD_FILE_TOO_SHORT                   /* VA: issue 528: ISM Metadata file too short  */



#define FIX_532_ISM_MD_INACTIVE                         /* VA: issue 532: improve MD coding in ISM inactive frames */



#define FIX_547_NAN_IGF_DEC                             /* FhG: issue 547: fix possible nan in IGF decoder */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/igf_dec.c

100644 → 100755
+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ static void IGF_replaceTCXNoise_2_new( 
        }

    }



#ifdef FIX_547_NAN_IGF_DEC

    rE = max( rE, 1.f );

#endif



    if ( n_noise_bands_tile )

    {

        noise_band_ratio = (float) n_noise_bands_tile / n_noise_bands;