Commit 42557102 authored by bayers's avatar bayers
Browse files

Merge branch... 

Merge branch '1005-usan-index-out-of-bounds-in-mc-bitrate-switching-for-decoding-to-stereo' into 'main'

Resolve "USAN: index out of bounds in MC bitrate switching for decoding to STEREO"

See merge request !1406
parents bce48f52 05b8554f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ 
#define NONBE_FIX_1000_G1_G2_SWB_TBE                          /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF                    /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */



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

lib_dec/ivas_mct_dec.c

+21 −14
Original line number Diff line number Diff line
@@ -774,6 +774,10 @@ static ivas_error ivas_mc_dec_reconfig( 
    ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config );



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

#ifdef NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE

    if ( st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )

    {

#endif

        if ( last_mc_mode == MC_MODE_PARAMMC )

        {

            st_ivas->hTcBuffer->nb_subframes = st_ivas->hParamMC->nb_subframes;
@@ -790,6 +794,9 @@ static ivas_error ivas_mc_dec_reconfig( 
            st_ivas->hTcBuffer->slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;

            mvs2s( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

        }

#ifdef NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE

    }

#endif



    /* JBM: when granularity goes down (e.g. MCT with CREND -> ParamMC with binaural fastconv

            render what still fits in the new granularity */