Commit 54b970e2 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into ci/fix-ivas-conf

parents 18ea5408 51c71ef0

lib_com/nelp.c

+4 −0
Original line number Diff line number Diff line
@@ -121,7 +121,11 @@ void generate_nelp_excitation( 


        for ( j = 0; j < len; j++ )

        {

#ifdef FIX_970_USAN_IN_NELP_SEED

            tmp[j] = ( ( *seed ) = (int16_t) ( 521 * ( *seed ) + 259 ) ) / PCM16_TO_FLT_FAC;

#else

            tmp[j] = ( ( *seed ) = 521 * ( *seed ) + 259 ) / PCM16_TO_FLT_FAC;

#endif

            tmp1[j] = ABSVAL( tmp[j] );

            I[j] = j;

        }

lib_com/options.h

+7 −2
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ 
#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue #1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */

#define FIX_1043_JBM_MD_BUFFER                          /* VA: issue 1043: JBM MD handle allocation is avoided in non-JBM EXT operations */

#define FIX_970_USAN_IN_NELP_SEED

#define FIX_1044_ISM_REND_MEMORY                        /* VA: issue 1044: Lower the memory of the ISM renderer handle. */





/* #################### End BE switches ################################## */
@@ -166,12 +169,14 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */

#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */

#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	



#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/

#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */

#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */



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

lib_dec/ivas_init_dec.c

+18 −0
Original line number Diff line number Diff line
@@ -2086,6 +2086,15 @@ ivas_error ivas_init_decoder( 
            {

                return error;

            }

#ifdef NONBE_FIX_1075

            if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

            }

#endif



            /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

            if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
@@ -2155,6 +2164,15 @@ ivas_error ivas_init_decoder( 
            {

                return error;

            }

#ifdef NONBE_FIX_1075

            if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

            }

#endif

        }

    }

lib_dec/ivas_mct_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,15 @@ static ivas_error ivas_mc_dec_reconfig( 
                {

                    return error;

                }

#ifdef NONBE_FIX_1075

                if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                    {

                        return error;

                    }

                }

#endif



                if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

lib_dec/ivas_omasa_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -386,6 +386,15 @@ ivas_error ivas_omasa_dec_config( 
                    {

                        return error;

                    }

#ifdef NONBE_FIX_1075

                    if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                    {

                        if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                        {

                            return error;

                        }

                    }

#endif

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                }

#endif