Commit 063bc0d7 authored by Devansh Kandpal's avatar Devansh Kandpal
Browse files

Merge branch '1736_basop_fix-commit-errors-in-mr-1598' into 'main-pc' 

Resolve "Fix commit errors in merge request 1598"

See merge request !1741
parents 4bec0fbb 7a59cc5c

lib_rend/ivas_crend_fx.c

+121 −122
Original line number Diff line number Diff line
@@ -1741,7 +1741,6 @@ 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

+1 −4
Original line number Diff line number Diff line
@@ -2502,15 +2502,12 @@ ivas_error ivas_binaural_reverb_init( 
    {

        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;

        }

        floatToFixed_arrL32( t60_temp, t60, Q15, CLDFB_NO_CHANNELS_MAX );

        floatToFixed_arrL32( t60_temp, t60, Q15, CLDFB_NO_CHANNELS_MAX );

        floatToFixed_arrL32( ene_temp, ene, Q15, CLDFB_NO_CHANNELS_MAX );

        revTimes = t60;

        revEne = ene;

lib_rend/ivas_reverb_utils_fx.c

+1 −5
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; // Represent in fixed point?

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

#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    ivas_error error;

#endif
@@ -149,10 +149,6 @@ ivas_error ivas_reverb_prepare_cldfb_params( 
        pOutput_ene[idx] *= expf( exp_argument );

    }

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES



    // Word32 avg_pwr_left_temp[CLDFB_NO_CHANNELS_MAX];

    // Word32 avg_pwr_right_temp[CLDFB_NO_CHANNELS_MAX];



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

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