Commit cc968c5b authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'main' into isar_selection_branch

parents c96f2cd2 b796b283

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 
#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_970_USAN_IN_NELP_SEED

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



#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */





/* #################### End BE switches ################################## */
@@ -179,6 +179,7 @@ 
#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 */

#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */



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

lib_dec/ivas_dirac_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -2317,8 +2317,13 @@ void ivas_dirac_dec_render_sf( 


                                for ( l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )

                                {

#ifdef FIX_1060_USAN_ARRAY_BOUNDS

                                    Cldfb_RealBuffer[j2][k][l] += g * *( tc_re++ );

                                    Cldfb_ImagBuffer[j2][k][l] += g * *( tc_im++ );

#else

                                    Cldfb_RealBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_re++ );

                                    Cldfb_ImagBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_im++ );

#endif

                                }

                                w1 += hSpatParamRendCom->num_freq_bands;

                            }

lib_dec/ivas_ism_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -274,6 +274,14 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
            }



            /* Close the TD Binaural renderer */

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

            ivas_td_binaural_close( &st_ivas->hBinRendererTd );



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

            {

                ivas_reverb_close( &st_ivas->hReverb );

            }

#else

            if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

            {

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );
@@ -284,6 +292,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
                    ivas_reverb_close( &st_ivas->hReverb );

                }

            }

#endif

        }

        else

        {

lib_dec/ivas_mct_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1210,11 +1210,15 @@ static ivas_error ivas_mc_dec_reconfig( 


            if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )

            {

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#else

                if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

                {

                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

                    st_ivas->hHrtfTD = NULL;

                }

#endif

            }



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_dec/ivas_omasa_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -402,12 +402,20 @@ ivas_error ivas_omasa_dec_config( 
            }

            else

            {

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

                if ( st_ivas->hBinRendererTd != NULL )

                {

                    /* TD renderer handle */

                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

                }

#else

                if ( st_ivas->hBinRendererTd != NULL && st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

                {

                    /* TD renderer handle */

                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

                    st_ivas->hHrtfTD = NULL;

                }

#endif

                /* ISM renderer handle + ISM data handle */

                ivas_omasa_separate_object_renderer_close( st_ivas );

            }