Commit b0f08726 authored by vaclav's avatar vaclav
Browse files

simplification within FIX_I68_MC_REVERB_FOR_514

parent ba21ab6c

lib_com/ivas_prot.h

+5 −24
Original line number Diff line number Diff line
@@ -5201,22 +5201,15 @@ ivas_error ivas_render_config_init_from_rom( 
 * Reverberator

 *----------------------------------------------------------------------------------*/



#ifdef FIX_I68_MC_REVERB_FOR_514

ivas_error ivas_reverb_open( 

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

#ifdef FIX_I68_MC_REVERB_FOR_514    

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

#endif

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

    RENDER_CONFIG_DATA *pConfig,                                /* i  : Reverb configuration                    */

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

);

#else /* FIX_I68_MC_REVERB_FOR_514 */

ivas_error ivas_reverb_open( 

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

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

    RENDER_CONFIG_DATA *pConfig,                                /* i  : Reverb configuration                    */

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

);

#endif /* FIX_I68_MC_REVERB_FOR_514 */



void ivas_reverb_close(

    REVERB_HANDLE *hReverb                                      /* i/o: Reverberator handle                     */
@@ -5389,13 +5382,14 @@ void ivas_reverb_interpolate_acoustic_data( 
    float *pOutput_dsr 

);



#ifdef FIX_I68_MC_REVERB_FOR_514

void ivas_reverb_get_hrtf_set_properties(

    float **ppHrtf_set_L_re,

    float **ppHrtf_set_L_im,

    float **ppHrtf_set_R_re,

    float **ppHrtf_set_R_im,

#ifdef FIX_I68_MC_REVERB_FOR_514

    const AUDIO_CONFIG inp_audio_format,

#endif

    const int16_t hrtf_count,

    const int16_t in_freq_count,

    const int16_t out_freq_count,
@@ -5403,20 +5397,7 @@ void ivas_reverb_get_hrtf_set_properties( 
    float *pOut_avg_pwr_R,

    float *pOut_i_a_coherence 

);

#else /* FIX_I68_MC_REVERB_FOR_514 */

void ivas_reverb_get_hrtf_set_properties(

    float **ppHrtf_set_L_re,

    float **ppHrtf_set_L_im,

    float **ppHrtf_set_R_re,

    float **ppHrtf_set_R_im,

    const int16_t hrtf_count,

    const int16_t in_freq_count,

    const int16_t out_freq_count,

    float *pOut_avg_pwr_L,

    float *pOut_avg_pwr_R,

    float *pOut_i_a_coherence 

);

#endif /* FIX_I68_MC_REVERB_FOR_514 */





/* Orientation tracking */

void ivas_orient_trk_Init(

lib_dec/ivas_reverb.c

+11 −13
Original line number Diff line number Diff line
@@ -783,11 +783,16 @@ static void set_fft_and_datablock_sizes( 
 * Sets reverb acoustic data (room acoustics and HRTF), interpolating it to the filter grid

 *-----------------------------------------------------------------------------------------*/



static void set_reverb_acoustic_data( 

    ivas_reverb_params_t *pParams, 

#ifdef FIX_I68_MC_REVERB_FOR_514

static void set_reverb_acoustic_data( ivas_reverb_params_t *pParams, const AUDIO_CONFIG inp_audio_config, const HRTFS_HANDLE hHrtf, ivas_roomAcoustics_t *pRoomAcoustics, int16_t subframe_len, int16_t nr_fc_input, int16_t nr_fc_fft_filter )

#else /* FIX_I68_MC_REVERB_FOR_514 */

static void set_reverb_acoustic_data( ivas_reverb_params_t *pParams, const HRTFS_HANDLE hHrtf, ivas_roomAcoustics_t *pRoomAcoustics, int16_t subframe_len, int16_t nr_fc_input, int16_t nr_fc_fft_filter )

#endif /* FIX_I68_MC_REVERB_FOR_514 */

    const AUDIO_CONFIG inp_audio_config, 

#endif

    const HRTFS_HANDLE hHrtf, 

    ivas_roomAcoustics_t *pRoomAcoustics, 

    const int16_t subframe_len, 

    const int16_t nr_fc_input, 

    const int16_t nr_fc_fft_filter )

{

    int16_t nr_out_ch, hrtf_idx, offset, iter_idx, bin_idx;

    float ln_1e6_inverted, delay_diff, exp_argument;
@@ -936,22 +941,15 @@ static ivas_error setup_FDN_branches( 
 * Allocate and initialize Crend reverberation handle

 *------------------------------------------------------------------------*/



#ifdef FIX_I68_MC_REVERB_FOR_514

ivas_error ivas_reverb_open(

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

#ifdef FIX_I68_MC_REVERB_FOR_514

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

#endif

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

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

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

)

#else /* FIX_I68_MC_REVERB_FOR_514 */

ivas_error ivas_reverb_open(

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

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

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

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

)

#endif /* FIX_I68_MC_REVERB_FOR_514 */

{

    ivas_error error;

    REVERB_HANDLE pState = NULL;