Commit a8fc740c authored by kinuthia's avatar kinuthia
Browse files

Merge branch '1809_ref_PortFlp1510' into 'ivas-float-update' 

[non-BE] 1809 ref port flp1510

See merge request !1878
parents 2e2b8692 ce641ae8

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ 
#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */

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

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */



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

#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_ism_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -251,6 +251,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 );
@@ -261,6 +269,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
@@ -1198,11 +1198,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

            }



            if ( st_ivas->hDiracDecBin[0] != NULL )

lib_dec/ivas_omasa_dec.c

+8 −2
Original line number Diff line number Diff line
@@ -430,14 +430,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 );

            }

lib_dec/ivas_sba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -515,11 +515,15 @@ 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;