Commit 7cb6389d authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1700_basop_PortFlpMR1511

parents f5271efe 85ed6678

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,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_1065_ISM_MD_HANDLE                    /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */

lib_dec/ivas_ism_dec_fx.c

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



            /* Close the TD Binaural renderer */

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

            ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );



            IF( EQ_32( 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_fx( &st_ivas->hBinRendererTd );
@@ -288,6 +296,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
                    ivas_reverb_close( &st_ivas->hReverb );

                }

            }

#endif

        }

        ELSE

        {

lib_dec/ivas_mct_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1436,11 +1436,15 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
            test();

            IF( st_ivas->hBinRendererTd != NULL && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) ) )

            {

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

                ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );

#else

                IF( EQ_16( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM, TRUE ) )

                {

                    ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );

                    st_ivas->hHrtfTD = NULL;

                }

#endif

            }



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

lib_dec/ivas_omasa_dec_fx.c

+8 −1
Original line number Diff line number Diff line
@@ -739,7 +739,14 @@ ivas_error ivas_omasa_dec_config_fx( 
        }

    }

    ELSE

    {

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

        if ( st_ivas->hBinRendererTd != NULL )

        {

            /* TD renderer handle */

            ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );

        }

#else

        /* TD renderer handle */

        test();

        IF( st_ivas->hBinRendererTd != NULL && EQ_16( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM, TRUE ) )
@@ -748,7 +755,7 @@ ivas_error ivas_omasa_dec_config_fx( 


            st_ivas->hHrtfTD = NULL;

        }



#endif

        /* ISM renderer handle + ISM data handle */

        ivas_omasa_separate_object_renderer_close( st_ivas );

    }

lib_dec/ivas_sba_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -595,11 +595,15 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
            /* Time Domain binaural renderer handle */

            IF( st_ivas->hBinRendererTd != NULL )

            {

#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING

                ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );

#else

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

                {

                    ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );

                    st_ivas->hHrtfTD = NULL;

                }

#endif

            }

            nchan_transport_old = add( nchan_transport_old, st_ivas->nchan_ism ); /*Q0*/

            st_ivas->ism_mode = ISM_MODE_NONE;