Commit c939706c authored by bayers's avatar bayers
Browse files

added forgotten code portion in refactoring, fix render config reader bitstream reading

parent ea838dcb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 
#define FIX_676_JBM_USAN                                /* FhG: fix usan in acessing transport channel buffers */

#define FIX_591_PARAMISM_JBM_ENER_CORRECTION            /* FhG: fix energy correction in ParamISM rendering */

#define FIX_JBM_MC2SBA                                  /* FhG: fix issue #679: check for transport vs. internal channel count in JBM prior to ivas_mc2sba() */

#define FIX_RENDER_CONFIG_BITSTREAM_READER

#define API_5MS                                         /* FhG: 5ms rendering capability */

#ifdef API_5MS 

#define API_5MS_BASELINE                                /* FhG: baseline with 20ms rendering and split rendering through 20ms branch */

lib_dec/lib_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -2178,8 +2178,11 @@ static ivas_error copyRendererConfigStruct( RENDER_CONFIG_HANDLE hRCin, IVAS_REN 
    mvr2r( hRCin->roomAcoustics.pFc_input, hRCout->room_acoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->room_acoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->room_acoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );

#ifdef CONTROL_METADATA_DIRECTIVITY

    mvr2r( hRCin->directivity, hRCout->directivity, 3 * MAX_NUM_OBJECTS );

#else

    mvr2r( hRCin->directivity, hRCout->directivity, 3 );



#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

    hRCout->split_rend_config.splitRendBitRate = SPLIT_REND_768k;

    hRCout->split_rend_config.dof = 3;

lib_util/render_config_reader.c

+3 −0
Original line number Diff line number Diff line
@@ -1476,6 +1476,9 @@ static ivas_error RenderConfigReader_readBinary( 


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

    pRenderConfigReader->length = file_size;

#ifdef FIX_RENDER_CONFIG_BITSTREAM_READER

    pRenderConfigReader->readOffset = 0;

#endif



    /****************************/

    /* Read the presence flag   */