Commit cf9f8f8c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_485_STATIC_BUFFERS

parent c45979aa

lib_com/ivas_dirac_com.c

+0 −35
Original line number Diff line number Diff line
@@ -930,9 +930,7 @@ void deindex_spherical_component( 
 *-----------------------------------------------------------------*/



void calculate_hodirac_sector_parameters(

#ifdef FIX_485_STATIC_BUFFERS

    DIRAC_ENC_HANDLE hDirAC, /* i  : DirAC handle                               */

#endif

    float RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i  : signal vector (L+1)^2 x N_bins, real part  */

    float ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i  : signal vector, imaginary part              */

    const float beta,                                             /* i  : forgetting factor for average filtering    */
@@ -951,17 +949,6 @@ void calculate_hodirac_sector_parameters( 
    float sec_I_vec_y[NUM_ANA_SECTORS];

    float sec_I_vec_z[NUM_ANA_SECTORS];



#ifndef FIX_485_STATIC_BUFFERS

    static int16_t firstrun_sector_params = 1;



    static float sec_I_vec_smth_x[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS];

    static float sec_I_vec_smth_y[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS];

    static float sec_I_vec_smth_z[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS];



    static float energy_smth[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS];

    static float azi_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS];

    static float ele_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS];

#endif



    for ( i_sec = 0; i_sec < NUM_ANA_SECTORS; i_sec++ )

    {
@@ -997,7 +984,6 @@ void calculate_hodirac_sector_parameters( 
            float *p_ene = &ene[i_sec * N_bands + i_band];



            float *p_diff = &diff[i_sec * N_bands + i_band];

#ifdef FIX_485_STATIC_BUFFERS

            float *p_azi_prev = &hDirAC->azi_prev[i_sec * N_bands + i_band];

            float *p_ele_prev = &hDirAC->ele_prev[i_sec * N_bands + i_band];
@@ -1005,15 +991,6 @@ void calculate_hodirac_sector_parameters( 
            float *p_sec_I_vec_smth_x = &hDirAC->sec_I_vec_smth_x[i_sec][i_band];

            float *p_sec_I_vec_smth_y = &hDirAC->sec_I_vec_smth_y[i_sec][i_band];

            float *p_sec_I_vec_smth_z = &hDirAC->sec_I_vec_smth_z[i_sec][i_band];

#else

            float *p_azi_prev = &azi_prev[i_sec * N_bands + i_band];

            float *p_ele_prev = &ele_prev[i_sec * N_bands + i_band];



            float *p_energy_smth = &energy_smth[i_sec][i_band];

            float *p_sec_I_vec_smth_x = &sec_I_vec_smth_x[i_sec][i_band];

            float *p_sec_I_vec_smth_y = &sec_I_vec_smth_y[i_sec][i_band];

            float *p_sec_I_vec_smth_z = &sec_I_vec_smth_z[i_sec][i_band];

#endif

            *p_sec_I_vec_x = 0.f;

            *p_sec_I_vec_y = 0.f;

            *p_sec_I_vec_z = 0.f;
@@ -1079,11 +1056,7 @@ void calculate_hodirac_sector_parameters( 
                                       sec_z_real * sec_z_real + sec_z_imag * sec_z_imag );

                }

            }

#ifdef FIX_485_STATIC_BUFFERS

            if ( hDirAC->firstrun_sector_params )

#else

            if ( firstrun_sector_params )

#endif

            {

                *p_sec_I_vec_smth_x = *p_sec_I_vec_x;

                *p_sec_I_vec_smth_y = *p_sec_I_vec_y;
@@ -1125,11 +1098,7 @@ void calculate_hodirac_sector_parameters( 
            }

            if ( tmp_diff > 0.5f )

            {

#ifdef FIX_485_STATIC_BUFFERS

                if ( hDirAC->firstrun_sector_params )

#else

                if ( firstrun_sector_params )

#endif

                {

                    *p_azi = 0.f;

                    *p_ele = 0.f;
@@ -1148,11 +1117,7 @@ void calculate_hodirac_sector_parameters( 
        }

    }



#ifdef FIX_485_STATIC_BUFFERS

    hDirAC->firstrun_sector_params = 0;

#else

    firstrun_sector_params = 0;

#endif



    return;

}

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -3895,9 +3895,7 @@ void ivas_dirac_dec_get_frequency_axis( 
    const int16_t num_freq_bands );                             /* i  : number of frequency bands                         */



void calculate_hodirac_sector_parameters(

#ifdef FIX_485_STATIC_BUFFERS

	DIRAC_ENC_HANDLE hDirAC,

#endif

    float RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],/* i  : signal vector (L+1)^2 x N_bins, real part      */

    float ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],/* i  : signal vector, imaginary part                  */

    const float beta,                                               /* i  : forgetting factor for average filtering         */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 


#define FIX_501_TABLE_IDX_INIT                          /* Dlb: Fix for the issue 501 */



#define FIX_485_STATIC_BUFFERS                          /* FhG: move static buffers in DirAC parameter estimator to the DirAC struct */

#define FIX_I503_ASAN_ERROR_IND_LIST                    /* VA: fix issue #503: address sanitizer error with IND_LIST_DYN */

#define FIX_473_JITTER_NONDIEGETIC_PANNING              /* FhG,Orange: add missing non-diegetic panning to JITTER */

lib_enc/ivas_dirac_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ ivas_error ivas_dirac_enc_open( 
    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC Config\n" ) );

    }

#ifdef FIX_485_STATIC_BUFFERS

    hDirAC->firstrun_sector_params = 1;

    set_zero( hDirAC->sec_I_vec_smth_x[0], NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS );

    set_zero( hDirAC->sec_I_vec_smth_y[0], NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS );
@@ -91,7 +90,6 @@ ivas_error ivas_dirac_enc_open( 
    set_zero( hDirAC->azi_prev, NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS );

    set_zero( hDirAC->ele_prev, NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS );

    set_zero( hDirAC->energy_smth[0], NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS );

#endif

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

     * DirAC main configuration

     *-----------------------------------------------------------------*/
@@ -920,9 +918,7 @@ void ivas_dirac_param_est_enc( 
                assert( l_ts <= DIRAC_NO_FB_BANDS_MAX );

#endif

                calculate_hodirac_sector_parameters(

#ifdef FIX_485_STATIC_BUFFERS

                    hDirAC,

#endif

                    Cldfb_RealBuffer,

                    Cldfb_ImagBuffer,

                    0.20f,

lib_enc/ivas_stat_enc.h

+0 −2
Original line number Diff line number Diff line
@@ -600,7 +600,6 @@ typedef struct ivas_dirac_enc_data_structure 
    float diffuseness_m[DIRAC_MAX_NBANDS];

    int16_t band_grouping[DIRAC_MAX_NBANDS + 1];

    int16_t block_grouping[5];

#ifdef FIX_485_STATIC_BUFFERS

    int16_t firstrun_sector_params;



    float sec_I_vec_smth_x[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS];
@@ -610,7 +609,6 @@ typedef struct ivas_dirac_enc_data_structure 
    float energy_smth[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS];

    float azi_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS];

    float ele_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS];

#endif



#ifndef SBA_MODE_CLEAN_UP

    int16_t dirac_to_spar_md_bands[DIRAC_MAX_NBANDS];