Commit ce05229b authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Updated room acoustics pointer assignment

parent 39f1c885

lib_dec/ivas_binRenderer_internal.c

+2 −5
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ ivas_error ivas_binRenderer_open( 
    int16_t convBand, k;

    ivas_error error;

#ifdef FIX_587_DEFAULT_REVERB

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics = NULL;

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;

#endif



    error = IVAS_ERR_OK;
@@ -1218,10 +1218,7 @@ ivas_error ivas_binRenderer_open( 
    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {

#ifdef FIX_587_DEFAULT_REVERB

        if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            pRoomAcoustics = &( st_ivas->hRenderConfig->roomAcoustics );

        }

        pRoomAcoustics = ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ? &( st_ivas->hRenderConfig->roomAcoustics ) : NULL;

#endif

        if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections ) ) != IVAS_ERR_OK )

        {

lib_rend/ivas_dirac_dec_binaural_functions.c

+4 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
    float frequency_axis[CLDFB_NO_CHANNELS_MAX];

    int16_t num_poses, pos_idx;

#ifdef FIX_587_DEFAULT_REVERB

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics = NULL;

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;

#endif



    num_poses = 1;
@@ -223,6 +223,9 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

            {

                mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );

#ifdef FIX_587_DEFAULT_REVERB

                pRoomAcoustics = NULL;

#endif

            }

            else

            {

lib_rend/lib_rend.c

+4 −1
Original line number Diff line number Diff line
@@ -8313,7 +8313,7 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 
    float frequency_axis[CLDFB_NO_CHANNELS_MAX];

    int16_t pos_idx;

#ifdef FIX_587_DEFAULT_REVERB

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics = NULL;

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;

#endif



    error = IVAS_ERR_OK;
@@ -8393,6 +8393,9 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 
            if ( *inputMasa->base.ctx.pOutConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

            {

                mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );

#ifdef FIX_587_DEFAULT_REVERB

                pRoomAcoustics = NULL;

#endif

            }

            else

            {