Commit e9b60c2e authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '5msAPI-with-default_20ms' of... 

Merge branch '5msAPI-with-default_20ms' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 5msAPI-with-default_20ms
parents 36854450 9778cf37

lib_dec/ivas_dirac_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1558,10 +1558,8 @@ void ivas_dirac_dec_set_md_map( 
    ivas_jbm_dec_get_adapted_subframes( nCldfbTs, hSpatParamRendCom->subframe_nbslots, &hSpatParamRendCom->nb_subframes );

#ifdef API_5MS

    /* copy also to tc buffer */

#ifdef MASA_AND_OBJECTS

    /* only for non-combined formats and combinded formats w/o discrete objects */

    if ( st_ivas->ivas_format != MASA_ISM_FORMAT || st_ivas->ism_mode != ISM_MASA_MODE_DISC )

#endif

    {

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

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

lib_util/render_config_reader.c

+2 −1
Original line number Diff line number Diff line
@@ -1333,7 +1333,8 @@ static ivas_error RenderConfigReader_readBinary( 


    fread( pRenderConfigReader->pBitstream, sizeof( uint8_t ), file_size, pReverbConfigFile );

    pRenderConfigReader->length = file_size;

#ifdef FIX_RENDER_CONFIG_BITSTREAM_READER

#ifdef API_5MS

    /* we read the config twice in the decoder, so reset the read offset here */

    pRenderConfigReader->readOffset = 0;

#endif