Commit 5cdaf311 authored by vasilache's avatar vasilache
Browse files

remove DELTA_PHI_PRECISION constant def

parent 912b696e

lib_com/ivas_cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -1190,9 +1190,6 @@ enum 
#define MASA_ANGLE_TOLERANCE                    0.5f

#define MASA_SUR_COH_THRESHOLD                  1e-7f

#define MASA_SUR_COH_PRECISION                  1e7f

#ifdef NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

#define DELTA_PHI_PRECISION                     100.0f

#endif

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC     4

lib_dec/ivas_masa_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -2424,7 +2424,7 @@ static int16_t ivas_decode_masaism_metadata( 
                    delta_phi = 180.0f / (float) ( no_phi_masa[bits_ism[obj] - 1][idx_el] ); /* 360/2*/

#ifdef NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

                    /* this is equivalent to testing if 'azimuth - hMasaIsmData->q_azimuth_old[obj] > delta_phi' with limited precision */

                    if ( roundf( DELTA_PHI_PRECISION * ( no_phi_masa[bits_ism[obj] - 1][idx_el] ) * ( azimuth - hMasaIsmData->q_azimuth_old[obj] ) ) / DELTA_PHI_PRECISION > 180.0f )

                    if ( roundf( 100 * ( no_phi_masa[bits_ism[obj] - 1][idx_el] ) * ( azimuth - hMasaIsmData->q_azimuth_old[obj] ) ) / 100.0f > 180.0f )

#else

                    if ( azimuth - hMasaIsmData->q_azimuth_old[obj] > delta_phi )

#endif
@@ -2435,7 +2435,7 @@ static int16_t ivas_decode_masaism_metadata( 
                    {

#ifdef NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

                        /* this is equivalent to testing if 'hMasaIsmData->q_azimuth_old[obj] - azimuth > delta_phi' with limited precision */

                        if ( roundf( DELTA_PHI_PRECISION * ( no_phi_masa[bits_ism[obj] - 1][idx_el] ) * ( hMasaIsmData->q_azimuth_old[obj] - azimuth ) ) / DELTA_PHI_PRECISION > 180.0f )

                        if ( roundf( 100 * ( no_phi_masa[bits_ism[obj] - 1][idx_el] ) * ( hMasaIsmData->q_azimuth_old[obj] - azimuth ) ) / 100.0f > 180.0f )

#else

                        if ( hMasaIsmData->q_azimuth_old[obj] - azimuth > delta_phi )

#endif