Commit 72f25d73 authored by norvell's avatar norvell
Browse files

Prefix switch with NONBE to reflect the fix is non-be

parent 934bcdea

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
#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_1045_ISM_BITRATE_SWITCHING                  /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */





/* #################### End BE switches ################################## */
@@ -177,6 +176,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_ism_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
            }



            /* Close the TD Binaural renderer */

#ifdef FIX_1045_ISM_BITRATE_SWITCHING

#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 )

lib_dec/ivas_mct_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ static ivas_error ivas_mc_dec_reconfig( 


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

            {

#ifdef FIX_1045_ISM_BITRATE_SWITCHING

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#else

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

lib_dec/ivas_omasa_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ ivas_error ivas_omasa_dec_config( 
            }

            else

            {

#ifdef FIX_1045_ISM_BITRATE_SWITCHING

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

                if ( st_ivas->hBinRendererTd != NULL )

                {

                    /* TD renderer handle */

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ ivas_error ivas_sba_dec_reconfigure( 
            /* Time Domain binaural renderer handle */

            if ( st_ivas->hBinRendererTd != NULL )

            {

#ifdef FIX_1045_ISM_BITRATE_SWITCHING

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#else

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