Commit 42d74c67 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1045_ISM_BITRATE_SWITCHING

parent 384c5b24

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ 
/* any switch which is non-be wrt selection floating point code */

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



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

#define NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES     /* Philips: issue 1067: QuaternionSlerp inaccuracies in corner cases */

#define NONBE_FIX_1065_ISM_MD_HANDLE                    /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

lib_dec/ivas_ism_dec.c

+0 −13
Original line number Diff line number Diff line
@@ -270,25 +270,12 @@ 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 );

                st_ivas->hHrtfTD = NULL;



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

                {

                    ivas_reverb_close( &st_ivas->hReverb );

                }

            }

#endif

        }

        else

        {

lib_dec/ivas_mct_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -1210,15 +1210,7 @@ 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

+0 −9
Original line number Diff line number Diff line
@@ -426,20 +426,11 @@ 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 );

            }

lib_dec/ivas_sba_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -531,15 +531,7 @@ ivas_error ivas_sba_dec_reconfigure( 
            /* Time Domain binaural renderer handle */

            if ( st_ivas->hBinRendererTd != NULL )

            {

#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

            }

            nchan_transport_old += st_ivas->nchan_ism;

            st_ivas->ism_mode = ISM_MODE_NONE;