Commit b6756ba2 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1630_ref_port_fl1492' into 'ivas-float-update' 

Port MR 1492 into float-pc

See merge request !1659
parents dcbf34c2 ca47c857

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ 
#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */

#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 NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	



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

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

lib_dec/ivas_ism_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -126,7 +126,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
@@ -2513,6 +2513,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++ )

    {