Commit 1fe0a855 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1060-usan-index-out-of-bounds-in-ivas_dirac_dec-c-for-osba-to-binaural_room-decoding-with-head
parents adf764e3 8b173a7f

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ 


#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	





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

lib_dec/ivas_ism_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -130,7 +130,12 @@ static ivas_error ivas_ism_bitrate_switching_dec( 


    {

        /* transfer subframe info from DirAC or ParamMC to central tc buffer */

#ifdef NONBE_FIX_1056_ISM_RATE_SWITCH

        /* only do this if we are not having done everything already in the TC decoding part and having only played out from the TC buffer */

        if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hSpatParamRendCom != NULL && st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )

#else

        if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hSpatParamRendCom != NULL && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE ) )

#endif

        {

            st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;

            st_ivas->hTcBuffer->subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;

lib_dec/ivas_jbm_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -2585,6 +2585,9 @@ static void ivas_jbm_dec_tc_buffer_playout( 
        slots_to_render -= st_ivas->hTcBuffer->subframe_nbslots[last_sf];

        last_sf++;

    }

#ifdef DEBUGGING

    assert( slots_to_render == 0 );

#endif



    for ( ch_idx = 0; ch_idx < st_ivas->hTcBuffer->nchan_transport_jbm; ch_idx++ )

    {