Commit 15941b5c authored by vaclav's avatar vaclav
Browse files

fix compilation when DEBUGGING is deactivated

parent 3f8c8b56

lib_com/ivas_dirac_com.c

+0 −7
Original line number Diff line number Diff line
@@ -949,7 +949,6 @@ void deindex_spherical_component( 
void calculate_hodirac_sector_parameters(

    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 int16_t N_bins,                                         /* i  : number of bins                             */

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

    const int16_t *band_grouping,                                 /* i  : indices of band groups                     */

    const int16_t N_bands,                                        /* i  : number of bands (groups)                   */
@@ -961,9 +960,7 @@ void calculate_hodirac_sector_parameters( 
)

{

    int16_t i_sec, i_bin, i_band;



    float p_real, p_imag, normI, energy, tmp_diff;



    float sec_I_vec_x[NUM_ANA_SECTORS];

    float sec_I_vec_y[NUM_ANA_SECTORS];

    float sec_I_vec_z[NUM_ANA_SECTORS];
@@ -978,10 +975,6 @@ void calculate_hodirac_sector_parameters( 
    static float azi_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS];

    static float ele_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS];



#ifdef DEBUGGING

    assert( N_bins <= DIRAC_NO_FB_BANDS_MAX );

#endif



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

    {

lib_com/ivas_prot.h

+27 −29
Original line number Diff line number Diff line
@@ -3895,8 +3895,7 @@ void ivas_dirac_dec_compute_directional_responses( 
#endif

    const float *surCohRatio,

    const int16_t shd_rot_max_order,                            /* i  : split-order rotation method                     */

    const float *p_Rmat              /* i  : rotation matrix                */

    ,

    const float *p_Rmat,                                        /* i  : rotation matrix                                 */

    const int16_t hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode                  */

);
@@ -3908,7 +3907,6 @@ void ivas_dirac_dec_get_frequency_axis( 
void calculate_hodirac_sector_parameters(

    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 int16_t N_bins,                                           /* i  : number of bins                                  */

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

    const int16_t *band_grouping,                               /* i  : indices of band groups                          */

    const int16_t N_bands,                                      /* i  : number of bands (groups)                        */

lib_enc/ivas_dirac_enc.c

+4 −2
Original line number Diff line number Diff line
@@ -760,8 +760,10 @@ void ivas_dirac_param_est_enc( 


            if ( hodirac_flag )

            {



                calculate_hodirac_sector_parameters( Cldfb_RealBuffer, Cldfb_ImagBuffer, l_ts, 0.20f, hDirAC->band_grouping, hDirAC->hConfig->nbands, hDirAC->hConfig->enc_param_start_band, azi_secs, ele_secs, diff_secs, ene_secs );

#ifdef DEBUGGING

                assert( l_ts <= DIRAC_NO_FB_BANDS_MAX );

#endif

                calculate_hodirac_sector_parameters( Cldfb_RealBuffer, Cldfb_ImagBuffer, 0.20f, hDirAC->band_grouping, hDirAC->hConfig->nbands, hDirAC->hConfig->enc_param_start_band, azi_secs, ele_secs, diff_secs, ene_secs );

            }



            if ( hodirac_flag )