Commit 4dd8fd4a authored by Devansh Kandpal's avatar Devansh Kandpal
Browse files

Added floating-point to fixed-point conversions (and vice-versa) to resolve build warnings

parent 089fc29b

lib_rend/ivas_crend_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -1741,6 +1741,7 @@ ivas_error ivas_rend_openCrend( 


#ifdef SPLIT_REND_WITH_HEAD_ROT

    for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )

    for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )

#endif

    {

#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_rend/ivas_reverb_fx.c

+6 −2
Original line number Diff line number Diff line
@@ -2502,8 +2502,12 @@ 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 )

        float t60_temp[CLDFB_NO_CHANNELS_MAX];

        float ene_temp[CLDFB_NO_CHANNELS_MAX];

        fixedToFloat_arrL(t60, t60_temp, Q15, CLDFB_NO_CHANNELS_MAX );

        fixedToFloat_arrL(ene, ene_temp, Q15, CLDFB_NO_CHANNELS_MAX );

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

        if ( ( error = ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfStatistics, sampling_rate, t60_temp, ene_temp ) ) != IVAS_ERR_OK )

        {

            return error;

        }

lib_rend/ivas_reverb_utils_fx.c

+7 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ivas_error ivas_reverb_prepare_cldfb_params( 
    float avg_pwr_right[CLDFB_NO_CHANNELS_MAX];

    float delay_diff, ln_1e6_inverted, exp_argument;

    const float dist = DEFAULT_SRC_DIST;

    const float dmx_gain_2 = 4.0f * EVS_PI * dist * dist / 0.001f;

    const float dmx_gain_2 = 4.0f * EVS_PI * dist * dist / 0.001f; // Represent in fixed point

#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    ivas_error error;

#endif
@@ -150,7 +150,12 @@ ivas_error ivas_reverb_prepare_cldfb_params( 
    }

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES



    ivas_reverb_set_energies( hHrtfStatistics->average_energy_l, hHrtfStatistics->average_energy_r, output_Fs, avg_pwr_left, avg_pwr_right );

    Word32 avg_pwr_left_temp[CLDFB_NO_CHANNELS_MAX];

    Word32 avg_pwr_right_temp[CLDFB_NO_CHANNELS_MAX];

    //floatToFixed_arr32(avg_pwr_left, avg_pwr_left_temp, Q15, CLDFB_NO_CHANNELS_MAX);

    //floatToFixed_arr32(avg_pwr_right, avg_pwr_right_temp, Q15, CLDFB_NO_CHANNELS_MAX);



    ivas_reverb_set_energies( hHrtfStatistics->average_energy_l, hHrtfStatistics->average_energy_r, output_Fs, avg_pwr_left_temp, avg_pwr_right_temp);

#else

    if ( ( error = ivas_reverb_get_fastconv_hrtf_set_energies( hHrtfFastConv, input_audio_config, use_brir, output_Fs, avg_pwr_left, avg_pwr_right ) ) != IVAS_ERR_OK )

    {