Commit 1adaa7f6 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_AVG_IAC_CLDFB_REVERB

parent 23339b3f

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -1743,15 +1743,11 @@ typedef enum 
#define RV_FILTER_MAX_HISTORY                   ( 512 - 160 )               /* for longest history */

#define RV_LENGTH_NR_FC                         ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1



#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB

#define RV_LENGTH_NR_FC_16KHZ                   ( RV_FILTER_MAX_FFT_SIZE / 4 ) + 1

#endif

#define IVAS_REVERB_DEFAULT_N_BANDS             31



#define LR_IAC_LENGTH_NR_FC                     ( RV_LENGTH_NR_FC )

#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB

#define LR_IAC_LENGTH_NR_FC_16KHZ               ( RV_LENGTH_NR_FC_16KHZ )

#endif



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

 * FB mixer constants

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
#define FIX_1372_ISAR_POST_REND

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB

#endif



#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

lib_rend/ivas_hrtf_fx.c

+0 −18
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ ivas_error ivas_HRTF_statistics_init( 


    switch ( sampleRate )

    {

#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB

        case 48000:

            HrtfStatistics->average_energy_l_dyn = (Word32 *) malloc( LR_IAC_LENGTH_NR_FC * sizeof( Word32 ) );

            if ( HrtfStatistics->average_energy_l_dyn == NULL )
@@ -354,23 +353,6 @@ ivas_error ivas_HRTF_statistics_init( 
            HrtfStatistics->average_energy_r = (const Word32 *) HrtfStatistics->average_energy_r_dyn;

            HrtfStatistics->inter_aural_coherence = (const Word32 *) HrtfStatistics->inter_aural_coherence_dyn;

            break;

#else

        case 48000:

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_48kHz_fx;

            HrtfStatistics->average_energy_r = defaultHRIR_right_avg_power_48kHz_fx;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_coherence_48kHz_fx;

            break;

        case 32000:

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_32kHz_fx;

            HrtfStatistics->average_energy_r = defaultHRIR_right_avg_power_32kHz_fx;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_coherence_32kHz_fx;

            break;

        case 16000:

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_16kHz_fx;

            HrtfStatistics->average_energy_r = defaultHRIR_right_avg_power_16kHz_fx;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_coherence_16kHz_fx;

            break;

#endif

    }

    HrtfStatistics->fromROM = TRUE;

lib_rend/ivas_objectRenderer_mix_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ static ivas_error DefaultBSplineModel_fx( 
            HrFiltSet_p->lr_energy_and_iac_fx[2] = defaultHRIR_coherence_32kHz_fx;       // Q23

            BREAK;

        case 16000:

#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB

            for ( i = 0; i < 3; i++ )

            {

                HrFiltSet_p->lr_energy_and_iac_dyn_fx[i] = (Word32 *) malloc( LR_IAC_LENGTH_NR_FC_16KHZ * sizeof( float ) );
@@ -437,11 +436,6 @@ static ivas_error DefaultBSplineModel_fx( 
            HrFiltSet_p->lr_energy_and_iac_fx[0] = (const Word32 *) HrFiltSet_p->lr_energy_and_iac_dyn_fx[0];

            HrFiltSet_p->lr_energy_and_iac_fx[1] = (const Word32 *) HrFiltSet_p->lr_energy_and_iac_dyn_fx[1];

            HrFiltSet_p->lr_energy_and_iac_fx[2] = (const Word32 *) HrFiltSet_p->lr_energy_and_iac_dyn_fx[2];

#else

            HrFiltSet_p->lr_energy_and_iac_fx[0] = defaultHRIR_left_avg_power_16kHz_fx;  // Q23

            HrFiltSet_p->lr_energy_and_iac_fx[1] = defaultHRIR_right_avg_power_16kHz_fx; // Q23

            HrFiltSet_p->lr_energy_and_iac_fx[2] = defaultHRIR_coherence_16kHz_fx;       // Q23

#endif

            BREAK;

    }

#endif

lib_rend/ivas_reverb_fx.c

+0 −11
Original line number Diff line number Diff line
@@ -1652,17 +1652,10 @@ ivas_error ivas_reverb_open_fx( 
    {

        params.pDsr_fx[i] = L_shl( params.pDsr_fx[i], params.pDsr_e[i] );

        move32();

#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB

        pHrtf_avg_pwr_response_l_const[i] = params.pHrtf_avg_pwr_response_l_const_fx[i]; /*Q28*/

        move32();

        pHrtf_avg_pwr_response_r_const[i] = params.pHrtf_avg_pwr_response_r_const_fx[i]; /*Q23+5*/

        move32();

#else

        pHrtf_avg_pwr_response_l_const[i] = L_shl( params.pHrtf_avg_pwr_response_l_const_fx[i], 5 ); /*Q23+5*/

        move32();

        pHrtf_avg_pwr_response_r_const[i] = L_shl( params.pHrtf_avg_pwr_response_r_const_fx[i], 5 ); /*Q23+5*/

        move32();

#endif

    }

    FOR( i = 0; i < lenT60_filter_coeff; i++ )

    {
@@ -1710,11 +1703,7 @@ ivas_error ivas_reverb_open_fx( 
        Word32 *pHrtf_inter_aural_coherence_const = (Word32 *) malloc( nr_fc_fft_filter * sizeof( Word32 ) );

        FOR( i = 0; i < nr_fc_fft_filter; i++ )

        {

#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB

            pHrtf_inter_aural_coherence_const[i] = L_shl( params.pHrtf_inter_aural_coherence_const_fx[i], 3 ); /*Scaling up to Q30*/

#else

            pHrtf_inter_aural_coherence_const[i] = params.pHrtf_inter_aural_coherence_const_fx[i]; /*Scaling up to Q30*/

#endif

            move32();

        }

        ivas_reverb_calc_correl_filters_fx( pHrtf_inter_aural_coherence_const, pTime_window_fx, pState->fft_size, pFft_wf_filter_ch0_fx, pFft_wf_filter_ch1_fx, &q_pFft_wf_filter_ch0_fx, &q_pFft_wf_filter_ch1_fx );