Commit c435e0f4 authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

Merge branch '68-fix-reverb-hrtf-processing-for-5-1-4-input' into 'main' 

Use uniform variable names for audio configuration (at the input of the reverb block)

See merge request !72
parents 6ecef305 9f60ef52

lib_com/ivas_prot.h

+4 −4
Original line number Diff line number Diff line
@@ -5203,7 +5203,7 @@ ivas_error ivas_render_config_init_from_rom( 
#ifdef FIX_I68_MC_REVERB_FOR_514

ivas_error ivas_reverb_open( 

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

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

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

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

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

    const int32_t output_Fs                                     /* i  : output sampling rate                    */
@@ -5223,7 +5223,7 @@ void ivas_reverb_close( 


ivas_error ivas_reverb_process(

    REVERB_HANDLE hReverb,                                      /* i/o: reverb state                            */

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

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

    const int16_t mix_signals,                                  /* i  : add reverb to output signal             */

    float pcm_in[][L_FRAME48k],                                 /* i  : the PCM audio to apply reverb on        */

    float pcm_out[][L_FRAME48k],                                /* o  : the PCM audio with reverb applied       */
@@ -5371,7 +5371,7 @@ void ivas_reverb_calc_color_levels( 


void ivas_reverb_prepare_cldfb_params(

    ivas_roomAcoustics_t *pInput_params,

    AUDIO_CONFIG renderer_config,

    AUDIO_CONFIG input_audio_config,

    int16_t use_brir,

    const int32_t output_Fs,

    float *pOutput_t60,
@@ -5394,7 +5394,7 @@ void ivas_reverb_get_hrtf_set_properties( 
    float **ppHrtf_set_L_im,

    float **ppHrtf_set_R_re,

    float **ppHrtf_set_R_im,

    const AUDIO_CONFIG inp_audio_format,

    const AUDIO_CONFIG input_audio_config,

    const int16_t hrtf_count,

    const int16_t in_freq_count,

    const int16_t out_freq_count,

lib_dec/ivas_reverb.c

+17 −17
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ static void set_fft_and_datablock_sizes( REVERB_HANDLE pState, int16_t subframe_ 
 *-----------------------------------------------------------------------------------------*/



#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 )

static void set_reverb_acoustic_data( ivas_reverb_params_t *pParams, const AUDIO_CONFIG input_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 */
@@ -821,7 +821,7 @@ static void set_reverb_acoustic_data( ivas_reverb_params_t *pParams, const HRTFS 


        /* Compute HRTF set properties using frequency-domain HRTF data */

#ifdef FIX_I68_MC_REVERB_FOR_514

        ivas_reverb_get_hrtf_set_properties( pHrtf_set_l_re, pHrtf_set_l_im, pHrtf_set_r_re, pHrtf_set_r_im, inp_audio_config, hHrtf->max_num_ir, subframe_len,

        ivas_reverb_get_hrtf_set_properties( pHrtf_set_l_re, pHrtf_set_l_im, pHrtf_set_r_re, pHrtf_set_r_im, input_audio_config, hHrtf->max_num_ir, subframe_len,

                                             nr_fc_fft_filter, pParams->pHrtf_avg_pwr_response_l, pParams->pHrtf_avg_pwr_response_r, pParams->pHrtf_inter_aural_coherence );

#else /* FIX_I68_MC_REVERB_FOR_514 */

        ivas_reverb_get_hrtf_set_properties( pHrtf_set_l_re, pHrtf_set_l_im, pHrtf_set_r_re, pHrtf_set_r_im, hHrtf->max_num_ir, subframe_len,
@@ -929,7 +929,7 @@ static ivas_error setup_FDN_branches( REVERB_HANDLE pState, ivas_reverb_params_t 
#ifdef FIX_I68_MC_REVERB_FOR_514

ivas_error ivas_reverb_open(

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

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

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

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

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

    const int32_t output_Fs                /* i  : output sampling rate              */
@@ -1014,7 +1014,7 @@ ivas_error ivas_reverb_open( 


    /* set up reverb acoustic data on the basis of HRTF data and renderer config  */

#ifdef FIX_I68_MC_REVERB_FOR_514

    set_reverb_acoustic_data( &params, transport_config, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter );

    set_reverb_acoustic_data( &params, input_audio_config, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter );

#else /* FIX_I68_MC_REVERB_FOR_514 */

    set_reverb_acoustic_data( &params, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter );

#endif /* FIX_I68_MC_REVERB_FOR_514 */
@@ -1268,14 +1268,14 @@ static void reverb_block( 
static ivas_error downmix_input_block(

    REVERB_HANDLE pState,

    float pcm_in[][L_FRAME48k],

    const AUDIO_CONFIG transport_config,

    const AUDIO_CONFIG input_audio_config,

    float *pPcm_out,

    const int16_t input_offset )

{

    int16_t i, s, nchan_transport;

    float dmx_gain = pState->dmx_gain;



    switch ( transport_config )

    switch ( input_audio_config )

    {

        case AUDIO_CONFIG_STEREO:

        case AUDIO_CONFIG_5_1:
@@ -1288,7 +1288,7 @@ static ivas_error downmix_input_block( 
        case AUDIO_CONFIG_ISM3:

        case AUDIO_CONFIG_ISM4:

        {

            nchan_transport = audioCfg2channels( transport_config );

            nchan_transport = audioCfg2channels( input_audio_config );

            for ( s = 0; s < pState->full_block_size; s++ )

            {

                float temp = pcm_in[0][input_offset + s];
@@ -1407,7 +1407,7 @@ static void mix_output_block( 


ivas_error ivas_reverb_process(

    REVERB_HANDLE hReverb,                 /* i/o: reverb state                       */

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

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

    const int16_t mix_signals,             /* i  : add reverb to output signal        */

    float pcm_in[][L_FRAME48k],            /* i  : the PCM audio to apply reverb on   */

    float pcm_out[][L_FRAME48k],           /* o  : the PCM audio with reverb applied  */
@@ -1416,7 +1416,7 @@ ivas_error ivas_reverb_process( 
    float tmp0[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp1[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp2[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];

    ivas_error error;



    if ( ( error = downmix_input_block( hReverb, pcm_in, transport_config, tmp1, i_ts * hReverb->full_block_size ) ) != IVAS_ERR_OK )

    if ( ( error = downmix_input_block( hReverb, pcm_in, input_audio_config, tmp1, i_ts * hReverb->full_block_size ) ) != IVAS_ERR_OK )

    {

        return error;

    }

lib_dec/ivas_reverb_filter_design.c

+2 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ void ivas_reverb_get_hrtf_set_properties( 
    float **ppHrtf_set_R_re,

    float **ppHrtf_set_R_im,

#ifdef FIX_I68_MC_REVERB_FOR_514

    const AUDIO_CONFIG inp_audio_format,

    const AUDIO_CONFIG input_audio_config,

#endif /* FIX_I68_MC_REVERB_FOR_514 */

    const int16_t hrtf_count,

    const int16_t in_freq_count,
@@ -648,7 +648,7 @@ void ivas_reverb_get_hrtf_set_properties( 
    float IA_coherence[2];



#ifdef FIX_I68_MC_REVERB_FOR_514

    if ( inp_audio_format == AUDIO_CONFIG_FOA || inp_audio_format == AUDIO_CONFIG_HOA2 || inp_audio_format == AUDIO_CONFIG_HOA3 )

    if ( input_audio_config == AUDIO_CONFIG_FOA || input_audio_config == AUDIO_CONFIG_HOA2 || input_audio_config == AUDIO_CONFIG_HOA3 )

#else /* FIX_I68_MC_REVERB_FOR_514 */

    if ( hrtf_count == 4 || hrtf_count == 9 || hrtf_count == 16 )

#endif /* FIX_I68_MC_REVERB_FOR_514 */

lib_dec/ivas_reverb_utils.c

+17 −17
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ typedef struct cldfb_convolver_state 
} cldfb_convolver_state;



static void ivas_reverb_get_fastconv_hrtf_set_energies(

    AUDIO_CONFIG input_config,

    AUDIO_CONFIG input_audio_config,

    int16_t use_brir,

    int32_t sampling_rate,

    float *avg_pwr_left,
@@ -83,7 +83,7 @@ static void ivas_reverb_get_fastconv_hrtf_set_energies( 


void ivas_reverb_prepare_cldfb_params(

    ivas_roomAcoustics_t *pInput_params,

    AUDIO_CONFIG renderer_config,

    AUDIO_CONFIG input_audio_config,

    int16_t use_brir,

    const int32_t output_Fs,

    float *pOutput_t60,
@@ -117,7 +117,7 @@ void ivas_reverb_prepare_cldfb_params( 
        pOutput_ene[idx] *= expf( exp_argument );

    }



    ivas_reverb_get_fastconv_hrtf_set_energies( renderer_config, use_brir, output_Fs, avg_pwr_left, avg_pwr_right );

    ivas_reverb_get_fastconv_hrtf_set_energies( input_audio_config, use_brir, output_Fs, avg_pwr_left, avg_pwr_right );

    for ( idx = 0; idx < CLDFB_NO_CHANNELS_MAX; idx++ )

    {

        pOutput_ene[idx] *= 0.5f * ( avg_pwr_left[idx] + avg_pwr_right[idx] ) * dmx_gain_2;
@@ -200,7 +200,7 @@ static void ivas_cldfb_convolver( 


static void get_IR_from_filter_taps(

    int16_t hrtf_idx,

    AUDIO_CONFIG input_config,

    AUDIO_CONFIG input_audio_config,

    int16_t use_brir,

    int32_t sampling_rate,

    int16_t pulse_length,
@@ -220,7 +220,7 @@ static void get_IR_from_filter_taps( 
    float out_CLDFB_imag[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; /* o  : imag part of Binaural signals     */

    float dirac_pls[CLDFB_NO_CHANNELS_MAX + 1];



    if ( ( input_config == AUDIO_CONFIG_FOA ) || ( input_config == AUDIO_CONFIG_HOA2 ) || ( input_config == AUDIO_CONFIG_HOA3 ) )

    if ( ( input_audio_config == AUDIO_CONFIG_FOA ) || ( input_audio_config == AUDIO_CONFIG_HOA2 ) || ( input_audio_config == AUDIO_CONFIG_HOA3 ) )

    {

        is_ambisonics = true;

    }
@@ -251,23 +251,23 @@ static void get_IR_from_filter_taps( 
    else

    {

        array_idx = 0;

        if ( input_config == AUDIO_CONFIG_5_1 )

        if ( input_audio_config == AUDIO_CONFIG_5_1 )

        {

            array_idx = channelIndex_CICP6[hrtf_idx];

        }

        else if ( input_config == AUDIO_CONFIG_7_1 )

        else if ( input_audio_config == AUDIO_CONFIG_7_1 )

        {

            array_idx = channelIndex_CICP12[hrtf_idx];

        }

        else if ( input_config == AUDIO_CONFIG_5_1_2 )

        else if ( input_audio_config == AUDIO_CONFIG_5_1_2 )

        {

            array_idx = channelIndex_CICP14[hrtf_idx];

        }

        else if ( input_config == AUDIO_CONFIG_5_1_4 )

        else if ( input_audio_config == AUDIO_CONFIG_5_1_4 )

        {

            array_idx = channelIndex_CICP16[hrtf_idx];

        }

        else if ( input_config == AUDIO_CONFIG_7_1_4 )

        else if ( input_audio_config == AUDIO_CONFIG_7_1_4 )

        {

            array_idx = channelIndex_CICP19[hrtf_idx];

        }
@@ -364,7 +364,7 @@ static void get_IR_from_filter_taps( 
 *-----------------------------------------------------------------------------------------*/



static void ivas_reverb_get_cldfb_hrtf_set_properties(

    AUDIO_CONFIG input_config,

    AUDIO_CONFIG input_audio_config,

    int16_t use_brir,

    int32_t sampling_rate,

    float *avg_pwr_left,
@@ -383,18 +383,18 @@ static void ivas_reverb_get_cldfb_hrtf_set_properties( 
    freq_count = 1 + half_fft_size;



    /* chosing between ambisonics, 5.1 and 7.1 MC audio */

    if ( ( input_config == AUDIO_CONFIG_FOA ) || ( input_config == AUDIO_CONFIG_HOA2 ) || ( input_config == AUDIO_CONFIG_HOA3 ) )

    if ( ( input_audio_config == AUDIO_CONFIG_FOA ) || ( input_audio_config == AUDIO_CONFIG_HOA2 ) || ( input_audio_config == AUDIO_CONFIG_HOA3 ) )

    {

        hrtf_count = 1;

    }

    else if ( input_config == AUDIO_CONFIG_7_1 )

    else if ( input_audio_config == AUDIO_CONFIG_7_1 )

    {

        hrtf_count = 7;

    }

    else

    {

        hrtf_count = 5;

        input_config = AUDIO_CONFIG_5_1;

        input_audio_config = AUDIO_CONFIG_5_1;

    }



    /* Zeroing before accumalation for average value computing */
@@ -408,7 +408,7 @@ static void ivas_reverb_get_cldfb_hrtf_set_properties( 
       Loop over all the HRTFs available  */

    for ( hrtf_idx = 0; hrtf_idx < hrtf_count; hrtf_idx++ )

    {

        get_IR_from_filter_taps( hrtf_idx, input_config, use_brir, sampling_rate, IR_length, current_HRTF_data_L, current_HRTF_data_R );

        get_IR_from_filter_taps( hrtf_idx, input_audio_config, use_brir, sampling_rate, IR_length, current_HRTF_data_L, current_HRTF_data_R );



        /* Perform forward FFT on both L/R channels */

        fft_rel( current_HRTF_data_L, (int16_t) fft_size, (int16_t) log2_fft_size );
@@ -457,7 +457,7 @@ static void ivas_reverb_get_cldfb_hrtf_set_properties( 
 *-----------------------------------------------------------------------------------------*/



static void ivas_reverb_get_fastconv_hrtf_set_energies(

    AUDIO_CONFIG input_config,

    AUDIO_CONFIG input_audio_config,

    int16_t use_brir,

    int32_t sampling_rate,

    float *avg_pwr_left,
@@ -480,7 +480,7 @@ static void ivas_reverb_get_fastconv_hrtf_set_energies( 
        output_fc[freq_idx] = (float) ( ( 2 * freq_idx + 1 ) * cldfb_freq_halfstep );

    }



    ivas_reverb_get_cldfb_hrtf_set_properties( input_config, use_brir, sampling_rate, avg_pwr_left_fft, avg_pwr_right_fft );

    ivas_reverb_get_cldfb_hrtf_set_properties( input_audio_config, use_brir, sampling_rate, avg_pwr_left_fft, avg_pwr_right_fft );



    ivas_reverb_interpolate_acoustic_data( FFT_SPECTRUM_SIZE, input_fc, avg_pwr_left_fft, avg_pwr_right_fft, CLDFB_NO_CHANNELS_MAX, output_fc, avg_pwr_left, avg_pwr_right );