Commit bbcc28cf authored by vaclav's avatar vaclav
Browse files

returns

parent 15a36a58

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ void ivas_reverb_calc_color_levels( 
    float *pTarget_color_R

);



ivas_error ivas_reverb_prepare_cldfb_params(

void ivas_reverb_prepare_cldfb_params(

    const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pInput_params,

    const HRTFS_STATISTICS_HANDLE hHrtfStatistics,

    const int32_t output_Fs,

lib_rend/ivas_reverb.c

+5 −4
Original line number Diff line number Diff line
@@ -1829,12 +1829,14 @@ static ivas_error ivas_binaural_reverb_open( 
    return IVAS_ERR_OK;

}





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

 * ivas_binaural_reverb_init()

 *

 * Allocate and initialize binaural room reverberator handle

 * for CLDFB renderers

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



ivas_error ivas_binaural_reverb_init(

    REVERB_STRUCT_HANDLE *hReverbPr,                      /* i/o: binaural reverb handle               */

    const HRTFS_STATISTICS_HANDLE hHrtfStatistics,        /* i  : HRTF statistics handle               */
@@ -1860,10 +1862,8 @@ ivas_error ivas_binaural_reverb_init( 
        revTimes = t60;

        revEne = ene;



        if ( ( error = ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfStatistics, sampling_rate, t60, ene ) ) != IVAS_ERR_OK )

        {

            return error;

        }

        ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfStatistics, sampling_rate, t60, ene );



        preDelay = (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX );

    }

    else
@@ -1878,6 +1878,7 @@ ivas_error ivas_binaural_reverb_init( 
    return error;

}





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

 * ivas_binaural_reverb_close()

 *

lib_rend/ivas_reverb_utils.c

+8 −4
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#define CLDFB_CONVOLVER_NTAPS_MAX ( 16 )

#define FFT_SPECTRUM_SIZE         ( 1 + ( RV_FILTER_MAX_FFT_SIZE / 2 ) )



#define N_INITIAL_IGNORED_FRAMES 4



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

 * Local function prototypes
@@ -69,13 +68,14 @@ typedef struct cldfb_convolver_state 


static void ivas_reverb_set_energies( const float *avg_pwr_l, const float *avg_pwr_r, const int32_t sampling_rate, float *avg_pwr_l_out, float *avg_pwr_r_out );





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

 * Function ivas_reverb_prepare_cldfb_params()

 *

 * Prepares reverb parameters for CLDFB-based reverberator

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



ivas_error ivas_reverb_prepare_cldfb_params(

void ivas_reverb_prepare_cldfb_params(

    const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pInput_params,

    const HRTFS_STATISTICS_HANDLE hHrtfStatistics,

    const int32_t output_Fs,
@@ -116,7 +116,7 @@ ivas_error ivas_reverb_prepare_cldfb_params( 
        pOutput_ene[idx] *= 0.5f * ( avg_pwr_left[idx] + avg_pwr_right[idx] ) * dmx_gain_2;

    }



    return IVAS_ERR_OK;

    return;

}
@@ -138,7 +138,9 @@ static void ivas_reverb_set_energies( 
    const int16_t cldfb_freq_halfstep = MAX_SAMPLING_RATE / ( 4 * CLDFB_NO_CHANNELS_MAX );

    float input_fc[FFT_SPECTRUM_SIZE];

    float output_fc[CLDFB_NO_CHANNELS_MAX];

    const int16_t avg_pwr_len = sampling_rate == 16000 ? LR_IAC_LENGTH_NR_FC_16KHZ : LR_IAC_LENGTH_NR_FC;

    int16_t avg_pwr_len;



    avg_pwr_len = sampling_rate == 16000 ? LR_IAC_LENGTH_NR_FC_16KHZ : LR_IAC_LENGTH_NR_FC;



    for ( freq_idx = 0; freq_idx < avg_pwr_len; freq_idx++ )

    {
@@ -151,4 +153,6 @@ static void ivas_reverb_set_energies( 
    }



    ivas_reverb_interpolate_acoustic_data( avg_pwr_len, input_fc, avg_pwr_l, avg_pwr_r, CLDFB_NO_CHANNELS_MAX, output_fc, avg_pwr_left, avg_pwr_right );



    return;

}