Commit 00da7984 authored by emerit's avatar emerit
Browse files

merge with main

parent b940c013

lib_dec/ivas_init_dec.c

+12 −0
Original line number Diff line number Diff line
@@ -2194,7 +2194,11 @@ ivas_error ivas_init_decoder_fx( 


        IF ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

        IF( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#else

            IF ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac_fx, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -2234,11 +2238,19 @@ ivas_error ivas_init_decoder_fx( 
            }

        }



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

    IF( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,

                                       st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

    {

        return error;

    }

#else

        IF ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,

                                            st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#endif



#if 1 /*Cleanup changes: fixed to float*/

        IF(st_ivas->hCrendWrapper!=NULL &&  st_ivas->hCrendWrapper->hHrtfCrend != NULL )

lib_rend/ivas_prot_rend.h

+4 −0
Original line number Diff line number Diff line
@@ -1697,9 +1697,13 @@ void ivas_binaural_reverb_processSubframe_fx( 
#ifdef IVAS_FLOAT_FIXED

ivas_error ivas_reverb_open(

    REVERB_HANDLE *hReverb,                /* i/o: Reverberator handle               */

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

    const HRTFS_STATISTICS_HANDLE hHrtfStatistics,                    /* i  : HRTF statistics handle                  */

#else

    const AUDIO_CONFIG input_audio_config, /* i  : reverb. input audio configuration */

    const HRTFS_HANDLE hHrtf,              /* i  : HRTF handle                       */

    const Word32 *lr_energy_and_iac_fx[],      /* i  : precomuputed lr energies and iac  */

#endif

    RENDER_CONFIG_HANDLE hRenderConfig,    /* i  : Renderer configuration handle     */

    const int32_t output_Fs                /* i  : output sampling rate              */

);

lib_rend/ivas_reverb.c

+5 −3
Original line number Diff line number Diff line
@@ -2370,9 +2370,9 @@ ivas_error ivas_reverb_open( 
    }

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

    set_reverb_acoustic_data_fx( &params, &hRenderConfig->roomAcoustics, nr_fc_input, nr_fc_fft_filter );

    params.pHrtf_avg_pwr_response_l_const = hHrtfStatistics->average_energy_l;

    params.pHrtf_avg_pwr_response_r_const = hHrtfStatistics->average_energy_r;

    params.pHrtf_inter_aural_coherence_const = hHrtfStatistics->inter_aural_coherence;

    params.pHrtf_avg_pwr_response_l_const_fx = hHrtfStatistics->average_energy_l_fx;

    params.pHrtf_avg_pwr_response_r_const_fx = hHrtfStatistics->average_energy_r_fx;

    params.pHrtf_inter_aural_coherence_const_fx = hHrtfStatistics->inter_aural_coherence_fx;

#else

    IF ( hHrtf == NULL && lr_energy_and_iac_fx != NULL )

    {
@@ -2541,8 +2541,10 @@ ivas_error ivas_reverb_open( 
    {

        return error;

    }

#ifndef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

    free( pDsr_e );

    free( pRt60_e );

#endif

    *hReverb = pState;



    return error;